improved vimdiff key mappings