Mapmerge update

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

Update to Latest
Some Gender Patches for the Genderless.
Merge pull request #247 from W3bster/master

Mapmerge update
Merge pull request #249 from TehFlaminTaco/master

Gender Fixes for IPCs and Diona.
Merge pull request #4 from jamiedigweed/master

Update to Latest