Update spec files to match upstream addon data updates
Somehow missed a conf.h reference when I was cleaning them out
Merge more upstream and fix a couple gamefolders problems.