5/22 home page updates
Merge branch 'master' into gh-pages
5/22 more home page build
Merge branch 'master' into gh-pages