finishing up cleanups before launch
bleh
Merge branch 'master' into gh-pages
update ghpages to master