Setting --satoshi-datadir from settings should work now
Merge branch '0.91-dev' of github.com:etotheipi/BitcoinArmory into 0.91-dev
Tweaked a lot of stuff for 0.90.99.5 testing release