Initial updates for Rails 4