ARMORY-129

Re-enable watchwallet functionality and stage some code for future enhancements.