win32 build fixes + fixup_bundle completion
Merge branch 'build_refactor' of github.com:Barobo/BaroboLabHack into build_refactor