edits to email templates
Merge branch 'master' of https://github.com/smithandrobot/tws_marketo