Merge changes in spree/core on _google_analytics partial back in

Fixes #34

Conflicts:

	app/views/spree/shared/_google_analytics.html.erb