Bed and mercenary shuttle refactoring.

Re-arranges the dormitory bedrooms again. Slightly fewer beds, slightly more maintenance.
Re-shapes the mercenary shuttle airlock and docking points to restore the cabin compartment shape.
Gives the xeno/viro some raison d'être until something more can be done about it.