Dev

Rails 4 upgrade...almost?