add vimdiff shortcuts setting and update README.md