update rspec-rails gem 3.0.1
Merge branch 'master' into songs

Conflicts:
	Gemfile.lock