ARMROY-150 - Review and correct new armoryd code

Added initial toJSONMap()/fromJSONMap() calls for PyBtcWallet. Also
cleaned up some random code.
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel