ARMORY-125

More armoryd enhancements and cleanup.
Merge branch 'devel' into doug-devel

Conflicts:
	armoryd.py
	armoryengine/Decorators.py
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
Merge branch 'devel' into doug-devel
ARMORY-125 - Improvements for armoryd

Added the ability to add wallets or lockboxes after armoryd has started.
Merge branch 'doug-devel' of github.com:etotheipi/BitcoinArmory into devel
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	armoryd.py