update for Capybara 2.0 Ambiguous Match error
Merge pull request #595 from dxypher/master

Update for Capybara 2.0 update and Ambiguous match error.