CMake fixes, clean old Makefiles.
Merge pull request #2 from ricortiz/FixCMakeBuild

CMake fixes, clean old Makefiles.