Some refactoring for scripthash payments
Merge branch 'master' of https://github.com/sarchar/pyspv