Mapmerge update

Updated mapmerge to work with the new mapfiles. USE IT!
Merge pull request #247 from W3bster/master

Mapmerge update