nsqd: more context cleanup
Merge pull request #240 from mreiferson/more_context_240

nsqd: more context cleanup