copy in my edited files in, since there was weirdness in the diffs
Merge pull request #1 from escapewindow/master

use hg debugsetparents instead of closing the branch; without this vcs-sync will fail