Git should ignore swp files

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