Error trying to bundle after pulling rspec-rails 3.7.0.pre

gistfile1.txt

I'm trying to get my repo in the same state as master but when I try to bundle install I get this:

Bundler could not find compatible versions for gem "rspec-support":
  In Gemfile:
    rspec-support

    rspec-expectations was resolved to 3.6.0.beta2, which depends on
      rspec-support (= 3.6.0.beta2)

    rspec-mocks was resolved to 3.7.0.pre, which depends on
      rspec-support (= 3.7.0.pre)


I've tried:
- Bundle Update from the original repo
- Bundle install fromt he original repo
- Killing the whole thing and pulling it down from the interwebz

I am doing this on master so noen of my changes exist on the branch I am bundling from, not that I think that should make any difference really.