support for p2sh and p2pubkey scripts
Merge branch 'master' of https://github.com/voisine/breadwallet into breadwallet