CNAME
Merge branch 'master' into gh-pages
Tweaked styling, diagrams, and text