Rails4 integration

A couple more tweaks to get Spree running on Rails 4. Next I'll start looking into actually adding spree to an existing Rails 4 app.