Merge pull request #54 from CounterpartyXCP/master

sync back
Doc updates on develop
Doc updates on develop
Merge fix
Merge pull request #57 from 45rpm/develop

Doc updates on develop
simplebuy step1

Conflicts:
	lib/api.py
simplebuy step2
simplebuy step3
vending machine url in config

Conflicts:
	counterblockd.py
	lib/api.py
Deprecate unused functions
Added changelog
Merge pull request #59 from 45rpm/develop

Deprecate unused functions
Merge pull request #60 from CounterpartyXCP/develop

Develop
Merge remote-tracking branch 'upstream/master'