I always figured that "nerd" implied some sort of technical knowledge or scientific mindedness. Hence slashdot being
"news for nerds, stuff that matters". Geek then I suppose, would be your standard comic book store customer.
Enough people use them interchangeably that it seems there is no longer any meaning. We should probably just jettison both words.