Improved incident merging.

Closes #33

Multiple incident markers are now correctly merged, even if other drivers
have incidents at the same time.