Adds TG's mapmerge2, a new TGM-compatible merger that handles things like dictionary expansion much better than the old tool, as well as supporting a git merge hook for map files.
This PR does not remove the old merger as this one is more annoying to setup.
