Merge branch 'develop' into feat/151/deploy-cluster-on-AWS

docs/source/python-server-api-examples.md

@@ -40,8 +40,10 @@ At a high level, a "digital asset" is something which can be represented digital
 In BigchainDB, only the federation nodes are allowed to create digital assets, by doing a special kind of transaction: a `CREATE` transaction.
 
 ```python
+from bigchaindb import crypto
+
 # create a test user
-testuser1_priv, testuser1_pub = b.generate_keys()
+testuser1_priv, testuser1_pub = crypto.generate_key_pair()
 
 # define a digital asset data payload
 digital_asset_payload = {'msg': 'Hello BigchainDB!'}

setup.py

@@ -71,7 +71,7 @@ setup(
         'rethinkdb==2.2.0.post4',
         'pysha3==0.3',
         'pytz==2015.7',
-        'cryptography==1.2.1',
+        'cryptography==1.2.3',
         'statsd==3.2.1',
         'python-rapidjson==0.0.6',
         'logstats==0.2.1',