emails working
html renders in email!
Merge branch 'master' into emailer