flying
orbiting laythe
banana ship
Merge branch 'jool' (early part)

Conflicts:
	persistent.sfs
	quicksave.sfs
Merge branch 'jool'