Cleaner shutdown

[mjgarton]

Wait to ensure various goroutines are exiting before we consider ourselves stopped, so use a waitgroup for all running goroutines and Wait() for it in Stop()

[nictuku]

Cool stuff. Thanks!