merge changes to gh-pages

because I forgot that's what puts this thing online!