Fixed ccgrep added git merge --no-ff shortcut.
Removing vi-mode.