Rolling up my changes from my mercurial repo