Deadwood snapshot update: inflight merging code finished

The code hasn't been tested, but Deadwood should now have multiple inflight query support.

Next: Test the code (make a custom DNS server that takes a few seconds to reply and increase Deadwood's timeout in the test)

In the meantime:

http://maradns.org/deadwood/snap/