Upgrading to Capybara 2.0
Merge branch 'test_updates_again' of git://github.com/scottsds/otwarchive into testing_updates