...
Merge branch 'newwallet' of github.com:etotheipi/BitcoinArmory into newwallet

Conflicts:
	armoryengine.py

Fixed a bunch of inconsistencies due to not pushing latest changes
before working on it on vacation on another computer.