Updated main CMakeLists and gitignore too.