Mac OS X now uses std::thread
CMake fixes on Mac OSX