Upgrades RSpec to 3.1 for issue #344

I roughly followed @x-light 's notes on issue #344 but for the most part the guide at https://www.relishapp.com/rspec/rspec-rails/docs/upgrade covers the essentials. All of the tests pass.