We forgot to add these changes to pull requests which were in development before we upgraded to Rails 5. We're also moving the rubocop rules to the basic files, so we're notified when we inherit from `ActiveRecord::Base`.