Misc robustness fixes, bugfixes

Conflicts:
	mailpile/config.py