Mapmerge update

Updated mapmerge to work with the new mapfiles. USE IT!