Rails 4 changes, all specs passing, cleanup