Upgrade to Capybara 2
Merge pull request #206 from infertux/capybara_2

Upgrade to Capybara 2