nsqd/nsqlookupd: registration fixes

this resolves some issues identified while testing the recent merging of tombstones in #106 (and adds tests to cover these cases) cc @jehiah