nsqd: improve in flight pqueue remove test

this actually asserts that the message removed was the one
we asked for (this is what was broken)
nsqd: fix inflight pqueue remove 'double Pop'
nsqd: fix missing lock around client map
nsqd: log client IDENTIFY
Merge pull request #390 from mreiferson/stuck_in_flight_390

nsqd: messages stuck in-flight
touch should set new timeout based on now; not last timeout
nsqd: use client's msg timeout for TOUCH
Merge pull request #407 from jehiah/touch_logic_407

nsqd: touch handling
Merge remote-tracking branch 'upstream/master' into embedded_html_assets