Don't pull this yet, just previewing changes for #1606

@myleshorton This was an old bug of mine in the network tracker code.  Whenever we got a presence telling us the peer was offline, we would remove it from the NetworkTracker, but instead of using the userid, we were using the full JID, so NetworkTracker never removed it.  This would cause us to have disconnected peers hanging around.