require rspec-rails 3.0

Conflicts:
	spec/spec_helper.rb