Bump Capybara to version 2
More fixes
WIP