clean up; more test cases
optional unconfirmed change
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop