nicer mail text
Merge branch 'master' of heroku.com:el-pasher