This commit updates the .gitignore file to ignore the proper files with the new tree system, and modifies the mapmerge files to the latest -tg- files, as those are already compatible and written for the new tree system.
