Modified CMake build, added dist information, build cleanup