Match settings with new rails 5 app
Match settings with new rails 5 app

In an effort to upgrade to rails 5, created a new rails 5 app and
copied/matched settings that are either new, or no longer valid.

ndoit/fenrir,ndoit/fenrir,ndoit/fenrir,ndoit/fenrir