Inc version
Use trip id for vehicle id in predictions
Merge branch 'master' into mbta

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