Merge "Ignoring vi swap file"