Use the content branch's version of an additional file.

This avoids any conflict between the published version and a changed version.
Remove accidental CNAME file
Merge remote-tracking branch 'nanoc-gh-pages/github-pages'