Merge branch 'master' of https://github.com/leehambley/rack-google-analytics

Conflicts:
	lib/rack/google-analytics.rb
	test/helper.rb

All specs pass