Cmake branch updated to compile on Mac OS X with C++11

Updated CMakeLists.txt and minor source fixes for compiling on Mac OS X