After I ran git checkout master, spork started complaining of 28 failures. After merging, it continued. Running bundle exec rspec spec/ I get 28 errors all having to do with the user_pages_spec.rb tests.