Finish Rails 4 upgrade (minus deprecations)