Use trip id for vehicle id for commuter rail
Fix parsing of gtfs id
Merge branch 'master' into mbta

Conflicts:
	src/boston/Bus/Map/parser/MbtaRealtimePredictionsParser.java