mailer configuration
Merge branch 'master' into square
Merge branch 'master' of github.com:gyermich/gigbadger into square
capistrano change