Added back solution dirs to the cmake files. Fixed some gitignore typos.