Tidied up CMakeLists.txt. Better checking for C++11