Rails 4.1!
Fixes based on Rails / Rspec upgrade warnings