Merge pull request #285 from JahPowerBit/testsuite

resolve tests conflict
fixes #232
Merge pull request #286 from JahPowerBit/develop

Proposition to ensure consensus
clean up asyncio stuff
Merge branch 'develop' of https://github.com/CounterpartyXCP/counterpartyd into develop
a little more clean up
[#263] 'callable' is also accepted + None as default value for missing parameters