Sync gh-pages with master

[pkufranky]

So gitref.org/zh is accessible. Thanks for the great reference.

[matthewmccullough]

Thanks for the contribution. The @github/training-team and I have taken the maintenance of this over so we'll be reviewing issues frequently now. We appreciate your efforts.

I'm combining branches where possible now.