Clean up CMake files

Supersedes #158
Oh, this wasn't there when I did it, I should comment it?