Modernize our fork

Add bundler. Get specs passing with a recent-ish spec.
Address rspec deprecations