messing around with mail stuff without testing it
Merge branch 'master' of github.com:glasserc/etc