Please pull fix for Rspec1

Please pull fix for Rspec1 - This is a merge of soup/master with the current sporkrb/spork master. I have checked the fix works for my rails 2.3 project.

Merging this into the official spork will also affect rubymine because it checks the a standard spork gem has been installed before running spork (ignoring gems installed from git repositories as bundle hides them from the standard list).