git revert to last commit before bundle update
update rspec to 2.12.0 to match capybara version