Updated ignores to include .swp files
Merge branch 'master' into dev to get the .gitignore update