Clean git merge residuals from .gitignore and add gnumeric temp files to it.