Missed a conflict resolution in the last PR.

...tics

Conflicts:
	lib/rack/google-analytics.rb
	test/helper.rb

All specs pass