ARMORY-150 - Review and correct new armoryd code

Use toJSONMap() for lockboxes. Also clean up some code, including a
couple of small bug fixes.
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel