Cleaned up CMakeLists.txt file to allow for building in a subdirectory, regardless of where
test
fix CMakeLists.txt
test subtree merge