inotify: add temp Rewatch method
tree: merge multiple recursive watchpoints into parent subtree
Reconfigure Travis CI to build under Mac OS X