CMakeLists.txt changes
More Travis changes