Added vim swap file exclusions to .gitignore
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from grahamboree/master

Added vim swap file exclusions to .gitignore