Upgrade to Capybara 2.0