Update spec/ factories and models
Fix layouts/mailer.html.erb
Update config/settings.yml