Changes to allow msbuild to build installers

No idea why, but manipulating CONFIG inside the build file confuses
msbuild command line builds. Work fine if you build from the IDE!