If you don't think -webkit may come back, lets just remove it completely.  Likewise, remove the commented out remnants in features/support/

Same issue as above with the ~> on webdriver.  removing the capybara constraint actually needed one test change.  Seems worthwhile.