'Commodity' and 'Cargohold' classes moved to their respective files.
Ship needs an equipment bay.
Merge branch 'ship'