Dear list, This commit is horribly misleading; there are *significant* changes in this commit because I merged in a local branch. I attempted to use `git rebase` because of a friend's suggestion; however it turned out to be a pain and I'll never do that again. Instead I'll make a patch between the two branches so that this lists all the changes and I won't have to bother with the same conflicts multiple times.
My apologies.
