huon, I tried to do the rebase -i and squash the commits together, but got lost in the land of git. Any suggestions on getting out of the muck of confusion? Thanks :)