Clean up command guessing regexes and put spec before cucumber

This allows for Capybara 2.0 RSpec DSL to be detected correctly