The directories which are watched should not be hardcoded
Merge pull request #3700 from benmccann/unhardcode-watch

The directories which are watched should not be hardcoded