Prepping to re-run reorg test
Merge branch 'armoryd' of git://github.com/etotheipi/BitcoinArmory into armoryd