turned on error delivery for ActionMailer
This merges the remote branch into my development branch.
Merge remote-tracking branch 'origin/master'