Allow watchers to be more cleanly stopped.
Add tests and small fix for watcher stop
Fix small error in watcher
Merge pull request #19 from stianeikeland/dpb587-add-watcher-stop

Stop a watcher, closes #17