Renaming test controller more adequately

Conflicts:

	src/chaplin/dispatcher.coffee
	test/spec/dispatcher_spec.coffee