Capitalizing CNAME
Merge branch 'master' into gh-pages
Rename cname to CNAME
Merge branch 'master' into gh-pages