Git should ignore swp files

Change-Id: I42a98912a9207c8deb29385cecd96d01a85d58bd
Merge "Git should ignore swp files"