Update CMake version on Travis, adjust CMakeLists