Add hgignore
Merge Clare's changes, with my parallel changes.