the current situation is proof that multiple branches is not maintainable
as if we needed more proof ;). yes, we know we botched the bootloader, and we're very, very sorry.
i'd like to use necromant's, but it's been tougher to read over the patches since there are so many huge commits, and other jobs struck which kept me from paying enough attention to this. given that, i think what i'm going to do is just treat it as a new program and read the sources from the top of the tree. after that, yes, i'll probably just end up replacing the contents of our repo with his in a single giant merge.