After much looking I've decided to use Jakub 'jimmac' Steiner's Original. It works really well with F-Spot which is what I'm using to organize my photos.
More coming as I get them into F-Spot.
When your tired of looking at my pictures be sure to head over to Bruce Smith's Wildlife, Pets, Vacation, Nature, and other photos site.