Navigate buffers with j/k instead of n/p.
Handle vimdiff case.