Added delete-bootstrap to factory reset, tweaked email opts
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	SDM.py