Add to/fromJSONMap methods... can't run unit tests though
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	armoryengine/MultiSigUtils.py