switch to use new google analytics code
Merge branch '302-google-analytics-upgrade'

Closes #302