order bug in last version; improve --force
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop

Conflicts:
	lib/api.py