Fix issue with counting identical spikes in cross-train terms.

See comments in the code for an explanation of how the fix works. The
problem was that
1. coincident spikes in otherwise non-identical trains were counted
twice
2. instead than adding 1 to the appropriate term for each pair of
coincident spikes, the code was adding 1+markage(i).