Bump Capybara to version 2
More fixes
WIP
WIP 2
WIP 4
WIP 5
WIP 6
WIP 7