gh-pages merge

I think we want all of these maintenance fixes that went into gh-pages, but I'd appreciate a review from at least one or two people to ensure nothing is going awry here.