Commit all (or at least as many as I could easily work out by diffing) changes from the old stewart branch into the new stewart branch
Add the last of the stuff that was missing from old stewart branch to make it all compile