Support for spring gem, fixing some issues with rspec