more email template fixes
Merge commit '8d79154769b063b67b8d9f1b6da0460e9f706a8c'

pushes to heroku got messed up