Merge "Ignore all Vim tmp files in .gitignore"