Moved cities and units to be saved last when saving a player

This way when loading a city or unit, the load code knows the entire owner is loaded, which is a great design for cache calculation on load.