Merge branch 'master' into gh-pages
updated text for main site
removed CNAME from three pieces
Merge branch 'gh-pages'
master delete