fixed kestral.json
removed quote stripping of convert_ship
Merge remote-tracking branch 'origin/master'