adds .swp files to gitignore
Merge branch 'staging' into production