Only print a warning on windows if core plugins fail to load
Use std::make_pair
Use modified merge modules in the installer
Add MakeDiff and MergeDiff functions