New and improved .gitignore
Modified CMakeLists.txt for consistency.