Use trip id for vehicle id for commuter rail
Fix parsing of gtfs id