patch over...
Merge branch 'develop' of https://github.com/tckeelin/BlueBerry into develop

Conflicts:
	node/__init__.pyc
	node/cli/__init__.pyc
	node/cli/commands.pyc
	node/cli/ez_setup.pyc
	node/cli/main.pyc
	node/client/__init__.pyc
	node/config.py
	node/config.pyc
	node/node.log
	node/peermanager/__init__.pyc
	node/peermanager/pdbutils.pyc
	node/peermanager/registryprobe.pyc
	node/server/__init__.pyc