Added readBlkFileUpdate() unittest (and bug fix)
Merge branch 'testing' into armoryd
Merge branch 'armoryd' of github.com:etotheipi/BitcoinArmory into armoryd