Autoemails: reformat EmailTemplate methods a little bit
Autoemails: reformat EmailTemplate methods a little bit

pbanaszkiewicz/amy,pbanaszkiewicz/amy,swcarpentry/amy,pbanaszkiewicz/amy,swcarpentry/amy,swcarpentry/amy