Fixed typo in armoryd.py
ARMORY-87 Improve ArmoryD Security
Create the armoryd.conf file on startup if it doesn't exist
Merge branch 'devel' into doug-devel

Conflicts:
	armoryd.py