Small bug solved in _merge_coarse_and_fine_clocks
Small bug solved in _merge_coarse_and_fine_clocks

some of the messages with t_stamp=0 are recorded before the clock
messages, so we  need to check in the end if there are no negative
jumps in time, and correct if so

jcornford/pyecog