This all went horribly wrong

These changes were meant to be on the branch, not on the master;  clearly I'm fucking up all over the place.

Yes.  People hate git - and Linus loves to make fun of people.  These are Facts.