Merge pull request #2 from Anonymooseable/master

Cleanup CMake stuff