Make mail service API consistant regardless of whether django or mandrill format templates are used
Merge branch 'master' of github.com:pkimber/mail