Fix rails testing environment stuff

Conflicts:
	spec/rails_helper.rb