make a bunch of stuff better
Merge branch 'master' into gh-pages