remove regid from flavour, just make it the label
remove ShipFlavour from Ship and clean up ShipType use a bit