fixing analytics code (i think)
Merge branch 'master' into gh-pages