Merge branch 'master' into gh-pages
plow updates
crosslet rides again!
Merge branch 'gh-pages'