Revert "Remove old-style event tags."
gitignore extended vim swap files
Merge pull request #17285 from saltstack/revert-17235-remove_old_style_tags

Revert "Remove old-style event tags."
Merge pull request #17288 from jfindlay/ignore_vim_swpon

gitignore extended vim swap files
Merge branch 'develop' of github.com:saltstack/salt into develop