Migrate to RSpec 3

Upgraded to RSpec 3 as described in
https://relishapp.com/rspec/docs/upgrade