More locations, diver start

Add support for NameLocal locations. Revise location selection
algorithms. To address case where players spawn in water, add a diver
loadout.