Fix for TestWatchpoint
Reconfigure Travis CI to build under Mac OS X