Cleanly upgraded capybara from 2.0.2 to 2.1.0; Green test run
Merge pull request #252 from jasnow/master

Cleanly upgraded capybara from 2.0.2 to 2.1.0. Green test run