Handle empty databases a little more gracefully.
Get rid of vi .swp files which were accidentally committed.
Ignore vi .swp files.