Update GRAND_PLAN and clean-up map.

Made map a bit bigger; made spawn areas snap to grid.