cleanup sep 8
Merge branch 'master' into gh-pages
cleanup sep 8 deploying