atempt at fixing inconsistent p2sh signature
Merge branch 'sign_p2sh_master' into blocktrail