Added omitting of CNAME when merging (useful for development).
Merge branch 'master' into gh-pages