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