Capybara 2.1

This is an update of #49.  It tests against capybara 2.1.0 final and reverses a change to spec_helper.