Between forking Jekyll Now to serve this site, and beginning this first post, the upstream repository gained several new commits. With a bit of digging, I reminded myself of the git commands necessary to merge those upstream changes...