Ignore Vim/Vi backup & swap files

Have Git ignore Vim/Vi backup & swap files.
Merge branch 'gitignore'