Updated .gitignore with improved version.
Improved CMake greatly (this will actually build now...)