Update to .gitignore to ignore vim swap files
Fixes to make tests green. Issue #2