Add stopid to each prediction for easier merging with alarms branch
Merge branch 'master' into toronto