Move all watchers to be in the yaml file.
Merge pull request #152 from ktf/use-yaml-for-watcher

Move all watchers to be in the yaml file.