Updates to tighten up our analytics JS
Merge pull request #2157 from darkwing/analytics-updates

Updates to tighten up our analytics JS