Fix Bug 913704: Tweak GA, Implement Changes From Gareth

Removed test code.
Merge pull request #74 from bensternthal/analytics-tweaks

Fix Bug 913704: Tweak GA, Implement Changes From Gareth