Upgraded to RSpec 3.1 and Cucumber.
Merge pull request #154 from dblock/upgraded-rspec-cucumber

Upgraded to RSpec 3.1 and more recent Cucumber.