oh and one of the big distinctions I find there is that
nerd = knowledgeable about a particular subject (can be a hobby but it's also possible to be a math 'nerd' for example)
geek = more related to a hobby (can't just be ANY subject, has to be a hobby)
--
http://img.imgcake.com/Rheine/saveusmariajpgat.jpg