Merge "update .gitignore for swap files"