Use Spring to run Rspec in guard
Merge branch 'master' into rails-3-2

Conflicts:
	Gemfile.lock