Upgrade to Capybara 2.1.
Merge pull request #2305 from refinery/capybara_2_0

Upgrade to Capybara 2.1.