Fix building under Linux
Reconfigure Travis CI to build under Mac OS X