ARMORY-125 Improvements for armoryd
Fixed unit tests and did edits of armoryd
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel