analytics
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
restore cname for gh-pages only
Merge branch 'master' into gh-pages

Conflicts:
	_includes/head.html
Merge branch 'master' into gh-pages
Update CNAME
Edit config, add favicon
Merge branch 'gh-pages'

Moving to master branch so it pushes correctly