Galley / Lymphad and variations

At present the galley and lymphad are different charges that support different combinations of "oar" and "sails", which is a bit confusing. They should probably be the same thing (Parker says they are) and that one version should support all the variations.