Merge "Add .gitignore for Vim tmp files"