Reviewing merge request "dysinger" → "mainline"

[merged]

dysinger:mailer has requested a merge with mainline:master:

I updated the mailer.rb and mailer_spec.rb to use activemailer/urlhelper-style urls. This let's Rails build the urls and works with all hosts and protocols (http/https).