Remove swap files, update .gitignore