update mailers|
Merge branch 'master' of https://github.com/owainlewis/funnel