Merge branch 'master' of github.com:sibblegp/coinbase_python

Conflicts:
	MANIFEST
	coinbase/__init__.py
	coinbase/models/error.py
	setup.py

Author: mhluongo

MANIFEST.in

@@ -0,0 +1,2 @@
+README.md
+coinbase/ca_certs.txt

coinbase/__init__.py

@@ -301,7 +301,7 @@ def buy_btc(self, qty, pricevaries=False):
 
     def sell_btc(self, qty):
         """
-        Sell BitCoin to Coinbase for USD
+        Sell Bitcoin to Coinbase for USD
         :param qty: BitCoin quantity to be sold
         :return: CoinbaseTransfer with all transfer details on success
         :raise: CoinbaseError with the error list received from Coinbase on

coinbase/models/error.py

@@ -4,4 +4,4 @@
 class CoinbaseError(Exception):
 
     def __init__(self, message, errors=None):
-        Exception.__init__(self, ' '.join([message] + (errors or [])))
+        super(CoinbaseError, Exception).__init__(self, ' '.join([message] + (errors or [])))

setup.py

@@ -4,6 +4,7 @@
     name='coinbase',
     version='0.2.1',
     packages=['coinbase', 'coinbase.models'],
+    package_data={'coinbase': ['ca_certs.txt']},
     url='https://github.com/sibblegp/coinbase_python',
     license='MIT',
     author='George Sibble',