Work on #916; needs testing
Added vim swap files to gitignore