This avoids importing from segwit.py to bumpfee.py
* Refactor blocktools.py so that witness script creation is its own function * Changed p2p-segwit to use new function