updated CMakeLists and generalized find stuff so nothing is relying on environment variables any more