take out the printf from main
Merge branch 'michael-0921' of http://github.com/mastercoin-msc/mastercore into michael-0921
temp save, pre-move of unit code
Merge branch 'michael-0921' of http://github.com/mastercoin-msc/mastercore into michael-0921

update
added p2sh as an acceptable ouput type pending a block on which to release the feature
* Added the concept of a redeemAddress which is optional on send_MP and send_to_owners, if set it will take the place of the senders address as the first address in a class B.  This is so that sender addresses which are not pubkeys (aka p2sh addresses) can designate an alternative address to redeem the bitcoins as only public keys are allowed in a multisig output
* Added a test script based on handy regtest scripts from @faizkhan00
Merge branch 'michael-0921' of http://github.com/mastercoin-msc/mastercore into michael-0921

getting the latest
Merge branch 'michael-0921' of http://github.com/mastercoin-msc/mastercore into michael-0921

updating locally
Merge branch 'p2sh-support' of https://github.com/wanderingbort/mastercore into wanderingbort-p2sh-support

Conflicts:
	src/mastercore.h

merged pull 102 - redeemAddress (change address)
p2shAllowed || isNonMainNet()
unused cleanup
Merge branch 'wanderingbort-p2sh-support' into michael-0921

merging into main (michael-0921)