ARMORY-125

More armoryd enhancements and cleanup.