Fix include path for snd_qf
Minor CMake fixes
Merge branch 'master' into warsow_merge
Merge back changes from master