Removed vim swp files and fixed gitignore to truly ignore them
Merge branch 'master' into swift