.gitignore now ignores .orig files (merging things)