Edited CMakeLists for travis support