Add `git mergetool` alias to eshell
Fix cider-mode leader mappings