Make tests run with rails 4 and update rspec
Merge pull request #60 from adimitrov/rails-4

Make tests run with Rails 4 and update RSpec