Fix OS X build

Conflicts:
	.travis.yml
	CMake/DisplayCluster.cmake
	CMake/FindPackages.cmake
	CMakeLists.txt

Change-Id: I81d6ea3a7a28188fcface9852f3614417e64bfac