nsqd: touch handling

when you TOUCH a message, the logic that checks bounds on the timestamp adds the msgtimeout twice when doing the check which it shouldn't. In addition it seems that the definition of touch "reset the msg timeout" would imply it's based on Now() just like it originally is, not that it extends the previous timeout.

cc: @mreiferson