conservation of assets
careful option; improved conservation check
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop