Updated git ignore, improved and simplified CMake definitions