Fix vim editing shorcut not to fail while rebasing
Add alias to rename current branch