Merge pull request #38 from timiblossom/gossip-dev

The real Gossip
Fix the gossip traffics blocking on client traffics
Merge remote-tracking branch 'upstream/master' into gossip-dev