First round of migrating to Rails 4.0.0