Capybara 2.1

This is a rework of the capy-version-fix branch.

I've required the new mechanize and made the focus changes clear that we're waiting on a fix in capybara.

I propose that we release this as v1.1.0.

Fixes #51, fixes #52