I use Everpix, which pulls in and organizes photos from Dropbox, my Camera, iCloud Photo Stream, iPhoto Library, and any other specified location (such as an email attachment folder) on my computer. It's pretty handy.
I haven't personally run into that problem, although I'm not sure if that's just because I don't have any duplicates or if Everpix just fixes it automatically.