Ignore git mergetool backup files

I use git mergetool to handle merge conflicts. The tool leaves .orig files as backups to the original files.

This makes git status complain about untracked files and fails the installation unit test because it detects these files as not being installed.

The attached patch solves both issues.