Readd CMake files for linux. Some small changes for linux g++.