Holy CRAP git is almost more trouble than it's worth
There, now it's REALLY fixed. I'm going to stop trying to rewrite history and just leave all the shit as it is.