Well, this very handy Venn Diagram outlines the qualities that separate them out quite nicely.
I would argue that geeks are still social inept, just less so that nerds and dorks. But that would make me a ….geek. 🙂
What’s the difference between a nerd and a geek? Or for that matter, a dork or a dweeb
Smart People I Know 
I love your chart, but where do I fit in? I am intelligent and obsessed, but with social eptitude. What is that?
That makes you a geek. If you are really obsessive, then geekiness is obvious. But otherwise, not so much. People tend to think of geeks as just IT people, but I used to run in a running group and they talked obsessively about running, and that made them just as geeky as computer people talking about computers.