Merge "Add vim swap files to gitignore"