Finished workaround for #398
Attempted fix for the Travis CI failure that we is CNR locally
Revert "Attempted fix for the Travis CI failure that we is CNR locally"

This reverts commit 990b37fe784b0fba2dc32ae8f54610afba9f7bb6.
Merge pull request #643 from YaleSTC/398_usermailer_spec_failure

Ensures that UserMailer_spec doesn't fail and UserMailer doesn't crash the RSpec environment load