switched _s files to _f
Updated gitignore to include vim swap files