Changed clj-span.models.surface-water/find-next-in-stream-step to prefer cardinal directions to diagonal moves.