>Github pages is fine, but the extra gh-pages branch is kind of annoying.

You don't need that anymore. You can run Github Pages out of a branch like /docs, which makes life much simpler. That's how I run most of my sites.