Fixed .gitignore
Merge remote-tracking branch 'remotes/origin/rrld_planB' into testing
Merge branch 'testing' of github.com:etotheipi/BitcoinArmory into testing