remove vim swap files and add them to git ignore
merge .gitignores