move cucumber test to capybara/rspec
Merge branch 'enhancements'