email system working
okay its really working this time!
Merge branch 'master' into kyle