ARMORY-140: Another try at making this work
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel