ignore cname on master (and not gh-pages?)
keep cname in master
Merge branch 'master' into gh-pages