Bump to Capybara 2.1 in gemspec
Fix a few remaining failures from the Capybara 2.1 suite