Another bug in -devel: comfort computations are wrong (fixed in my git)

[neroden]

Single horse + hackney carriage = comfort 150 (look at the chart)
Double horse + omnibus = comfort 114 (look at the chart)

It's very irritating that -devel gets badly broken so routinely.  

EDIT: I've fixed this one, on my github in my jp-devel branch.

The bug was an improper computation of comfort when there was exactly one passenger vehicle.

While I was at it (eyeroll) I fixed two other logic bugs in the computation of comfort related to standing passengers.

[jamespetts]

Thank you for the fixes! Much appreciated.