ARMORY-111 - Finally got notifications working properly for wallets and lockboxes! Also did some minor code cleanup.