Merge rspec3

I used the merge-commits from my already merged master to merge the PR from @TVScoundrel into your master.

The resulting specs are running with rspec3 without deprecation warnings