Update CMake modules submodule to updated Github repository.
Fix minor things in main CMakeLists file.