WIP - cleaned up shutdown method (removed waiting for clients to finish)
Merge branch 'master' of github.com:rockyhe/rockykevinleon
Fixed errors after merging Leon's gossiper stuff