Provide a --watcher option to allow the user to specify which watcher to use
Use poll flag for sane instead of switching between watchers
Update changelog
Merge pull request #970 from jlauemoeller/master

Provide a --watcher option to allow the user to specify watcher to use