Fix infinite add_watches loop with symbolic links

Added a check to ensure that add_watches doesn't run on the same folder over and over again. This occurs at least when circular symbolic links are present.

Fix #543
Merge remote-tracking branch 'michaelbeaumont/fix/issue-543' into develop