tree: add an edge-case for rewatching node which has both recursive and regular watches set
Reconfigure Travis CI to build under Mac OS X