Merge branch 'mailer'; adds payment confirm mailer