Further viacoinalize codebase
Merge branch 'master' of github.com:/btcdrak/BitcoinArmory