config changes for me

Conflicts:
	Gemfile.lock
	test/test_helper.rb