Add Vim swapfiles to the gitignore
Merge branch 'master' into multiple_task_maps

Bringing in the newest .gitignore changes.