Map changes

Include Buster and Madcap's work on relocation of spawn points, shops,
etc...