upgraded rails to 3.2.10
upgraded capybara to 2.0.2; moved capybara specs to spec/features
let's try adding wait_until back for Capybara..
trying the selenium driver
Merge branch 'upgrade-rails'