make rspec work again
updated Gemfile.lock with rspec-rails
merge changes