Found the perfect solution for organising all my photos. Shotwell http://yorba.org/shotwell/ with its awesome deduping powers! And Dropbox http://db.tt/9UM5KESp for cloud storage. Dropbox has nifty Linux daemons that lets me sync my photo album across all my Linux boxes, without being logged into the GUI console.