finish up mailer
Merge pull request #33 from jereln/mailer

finish up mailer
prep for deployment
Merge pull request #34 from jereln/heroku_prep

prep for deployment
prep for deployment
Merge pull request #35 from jereln/heroku_prep

prep for deployment
fixing merge conflicts