Crap new map additions broken.

Will re-add when I can get the map merger to work.