Capybara 2.0 support, and other fixes

**WIP - DO NOT MERGE**