Clean up CMake files

Supersedes #158
Well, fixed, and added a note about this