Add auto email.text from email.html when required
Refactor incident emailing to use new emailer
Improve incident email logging