Refresh CMakeLists and travis yml