What the hell was I thinking?

Somehow committed and pushed everything in the gh-branches.