fixed nits; added *.swo vi files to .gitignore