rework watcher tests
Reconfigure Travis CI to build under Mac OS X