killing mailer -- too much $$$
Merge branch 'master' of https://github.com/pfletch1023/WEB