Improved world map generation WRT cities, added pharmacy and gun store to world_terrain.dat to ensure that having different stores works.  Added face_road flag to world_terrain.