Revert RSpec 3 upgrades

Merge this pull request if recent upgrades to specs have landed your outstanding pull request in 'merge conflict hell'

Reverts commits so that HEAD will be equivalent to 2e06c59884ffe0806b455d2ba571bb0d6229e714