commiting some changes
Merge branch 'master' of https://github.com/nojoek/lets530

pulling down master branch, should be semi finalized
changed production mailer env