cleanup
cleanup
even more cleanup
Merge branch 'master' into gh-pages