compile again
Merge branch 'doug-devel' into devel
ARMORY-125

More armoryd enhancements and cleanup.
ARMORY-129

Re-enable watchwallet functionality and stage some code for future enhancements.
ARMORY-125 Improvements for armoryd
Fixed unit tests and did edits of armoryd
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel
ARMORY-129

Add proper support for multiple e-mail recipients.
ARMORY-125

Fixed some armoryd wallet loading issues, performed some code cleanup
and made some startup logging more consistent.
ARMORY-129

Add support for multiple functions to be executed whenever a new block
arrives.
ARMORY-129

Add initial set of subcommands to "armoryd" watchwallet command.
Merge branch 'devel' into doug-devel

Conflicts:
	armoryd.py
	armoryengine/Decorators.py