Upgrade rspec

WIP. Opening PR so I don't interfere with things @mlandauer might be doing.