Feature/email trigger changes

This pull request fixes for email design content as well as changes to triggers (rules).

b/17281770
b/17203372 (already fixed)
Additionally, are you sanitizing your input values before this block?  Because you're not doing so here, and you've opened this up to script injection vulnerabilities for people who have HTML email enabled by default (i.e. almost everyone).

http://tvtropes.org/pmwiki/pmwiki.php/Main/NiceJobBreakingItHero