Git should ignore vim .swp files.
Fix some tests. 5 still don't pass.