Merge branch 'master' into gh-pages
new copy, layout changes

end in sight!
Merge branch 'gh-pages'