Wait in server.Shutdown for listener goroutine to exit
Merge pull request #91 from boourns/unstable

Wait in server.Shutdown for listener goroutine to exit