Tweaked some crypto and wallet tweaks
Merge branch 'notifyfix' of github.com:etotheipi/BitcoinArmory into notifyfix

Conflicts:
	armoryengine/PyBtcWalletRecovery.py
	qtdialogs.py