Second go on balancing the ships.
Also rearanged mass entries on ship.luas a bit. More logical this way.
Tweaking xylophis
Merge remote-tracking branch 'nozmajner/rebalance2'