Merge "Ignores vim temporary files from git" into main