Fix RSpec 3 deprecation warnings

Basically just to let me stop monkey patching this stuff.