Fixed a couple tiny things...
Merge branch 'alan_devel' of github.com:etotheipi/BitcoinArmory into alan_devel