Update CNAME to direct to www

As part of GitHub's new system subdomains are preferred
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages