Completely overhaul CMakeLists.txt
Merge pull request #1 from cottsay/master

Completely overhaul CMakeLists.txt