Move GA up and social media down
Merge branch 'master' into gh-pages