WIP Update capybara/capybara-webkit

Mainly involved disambiguating a few selectors as capybara 2 is more
strick and will raise an error if a selector matches more than one
element on the page, which is pretty sensible when you think about it.

There are still a handful of failing features to sort out, including
the javascript-based ones.