Changes

Try to promote people instead of creating them out of thin air

This may reintroduce deadlocks, which is why this commit may need
a bit more testing (right now only minimal testing was performed
on small galaxies)
 (commit: 986b5c5)