Remove references to `Spec`
Remove no longer used method `rspec2?`
Remove require statements for RSpec 1

Refactoring in baby steps here, trying to make sure I don’t break anything else.
Simplify conditional
Simplify conditional even more.
Merge branch 'remove-support-for-rspec1' into us-master