This is a weird one, take a look if you could

I think my master was out of date, I made some changes and then merged in the canonical which blew up a bunch of stuff.  I just want to make sure nothing is lost or broken.