typo
Merge branch 'master' of https://github.com/PhantomPhreak/counterpartyd
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop