my first time
Merge branch 'master' of https://github.com/kmcintyre/trickysmtpstandoff

because, well, fuck it man