removed analytics since it's disrupting my js
Merge branch 'master' into gh-pages