Merge "MASTER Ignore vim swap files"