-2038
Merge branch 'master' into gh-pages
Remove all the insidious stuff I don't want