Submodule acrobatics
Fixed (mostly) CMakeLists.txt files