Simple watching/unwatching
Reconfigure Travis CI to build under Mac OS X