As a big google fan-boy and someone that usually is on top of technology I was pretty suprised to find out that I missed this one..

I installed Picasa a few years ago and didn't find it that useful (no features?) - but now.. OMG..

It can use the location data that some cameras have, like the iPhone, it just shows your pics on a map where you took them - you can search them by address!  It'll sync to the web, help you backup, make galleries, along with all the normal stuff photo sorting software should be doing.. I'm using it to sort photos on all my computers now, and you should too - http://picasa.google.com