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