Revert "Update Capybara's feature DSL implementation"

This reverts commit 7eb6267f5e2c449990ca02ec77378167b0903af9.
Bump for 2.1.1 release