missed some refactored files
Merge branch 'xpbackport' of https://github.com/etotheipi/BitcoinArmory into xpbackport