See the latest commit -- if you think everything looks good, I'm ready to rebase when you are.   (I'd prefer, by the way, to keep the initial commit separate, the change to .gitignore? I kinda think that that commit should have been part of a previous merge anyway, but it's logically separate enough that I sort of think it should be a separate commit unless you or Frank objects.)