Upgrade to Capybara 2.1