now runs in Rails 4 and Ruby 2.1.2
remove rspec 3 deprecation warnings
Merge branch 'upgradetorails4'