Sync with master

requirements.txt

@@ -1,14 +1,17 @@
-Twisted==15.0.0
-pybitcoin==0.8.3
-ecdsa==0.11
-kademlia==0.4
+base58==0.2.2
+bitcoin==1.1.36
+bitmerchant==0.1.8
+cachetools==1.1.3
+commontools==0.1.0
+ecdsa==0.13
+keychain==0.1.3
+pybitcoin==0.9.5
 pybitcointools==1.1.15
 python-bitcoinrpc==0.1
-requests==2.5.1
-rpcudp==1.0
+requests==2.7.0
+six==1.9.0
+Twisted==15.4.0
 txJSON-RPC==0.3.1
-u-msgpack-python==2.0
-utilitybelt==0.2.2
-zope.interface==4.1.2
+utilitybelt==0.2.6
 virtualchain==0.0.1
-keychain
+zope.interface==4.1.2

setup.py

@@ -5,32 +5,32 @@
     ~~~~~
     copyright: (c) 2014 by Halfmoon Labs, Inc.
     copyright: (c) 2015 by Blockstack.org
-    
+
     This file is part of Blockstore
-    
+
     Blockstore is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
-    
+
     Blockstore is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
-    along with Blockstore.  If not, see <http://www.gnu.org/licenses/>.
+    along with Blockstore. If not, see <http://www.gnu.org/licenses/>.
 """
 
 from setuptools import setup, find_packages
 
 setup(
     name='blockstore',
-    version='0.0.3',
+    version='0.0.4',
     url='https://github.com/blockstack/blockstore',
     license='GPLv3',
-    author='Onename',
-    author_email='support@onename.com',
-    description='A key-value store for name registration on the Bitcoin blockchain',
+    author='Blockstack.org',
+    author_email='support@blockstack.org',
+    description='Name registrations on the Bitcoin blockchain with external storage',
     keywords='blockchain bitcoin btc cryptocurrency name key value store data',
     packages=find_packages(),
     scripts=['bin/blockstored'],
@@ -38,13 +38,9 @@ setup(
     zip_safe=False,
     include_package_data=True,
     install_requires=[
-        'pybitcoin>=0.8.3',
-        'kademlia>=0.2',
-        'python-bitcoinrpc>=0.1',
-        'txjson-rpc>=0.3',
-        'utilitybelt>=0.2.2',
         'virtualchain>=0.0.1',
-        'keychain'
+        'kademlia>=0.5',
+        'keychain>=0.1.3'
     ],
     classifiers=[
         'Intended Audience :: Developers',
@@ -55,4 +51,4 @@ setup(
         'Topic :: Security :: Cryptography',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-)
+)