made return path setting optional
Merge branch 'master' of https://github.com/citco/mailer