bug in calculation of holders
simplified version checking
regular version, database and bitcoind checking in the API
Merge branch 'master' into develop

Conflicts:
	versions.json
revision version numbers
carefulness
simplify betting fees: just deduct from pot at settlement
update test books
update changelog
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop
restore get_address to CLI, at least