Fix watcher restarts
Fix watcher restarts

Resolves gh-957
Resolves gh-967

hayesgm/brunch,kidaa/brunch,justinwoo/brunch,lalomartins/brunch,rlugojr/brunch,PeterDaveHello/brunch,ondreian/brunch,brunch/brunch,Flaise/brunch,hellyeahllc/brunch