Rough draft and renaming of email templates. Not sure if we can generalise the new emails to work for other payments than annual membership. Need to check that m.member_type is still used in new system.