Added option to force watch to use polling
Merge pull request #2165 from Zequez/master