readding accidentally deleted bits
Merge branch 'master' of https://github.com/Plantain/sms-mailinglist