Left out a fix for notifyOnSurpriseTx().
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel