Upgraded to RSpec 3.1 and Cucumber.
Merge remote-tracking branch 'other_fork/upgraded-rspec-cucumber' into ignore_other_tags