Add a better calc command
Add a better way to handle vimdiff