fix for mailer
Fixed mailer but have customerrors cukes going RED on me.
resolved som conflicts
fixed the problem?
Merge pull request #206 from tochman/develop

Fix for mailer.rb
-qmMerge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into doc_version_control_clean