Merge branch 'hotfix/0.22.1'
Don't hardcode Google Analytics and Pingdom IDs
Merge branch 'hotfix/0.22.2' into develop