Fix ignoring of vim swap files
Merge branch 'update-gitignore'