     (use-package evil-commentary
       :config (evil-commentary-mode)
       :diminish evil-commentary-mode)
-    ; evil-snipe, but change keybindings to be a text-object motion  (i.e. op [ia] [zZ] cc)
-    ; to make it easier to remember.  Also, disable normal-mode s/S override, and
-    ; use leader-[zZ] instead.
-    (use-package evil-snipe
-      :init
-      (progn
-        (setq evil-snipe-auto-disable-substitute nil))          ; disable override of s operator
-      :diminish evil-snipe-local-mode
-      :config
-      (progn
-        (add-hook 'magit-mode-hook #'turn-off-evil-snipe-override-mode)
-        (define-key evil-inner-text-objects-map "z" #'evil-snipe-x)
-        (define-key evil-outer-text-objects-map "z" #'evil-snipe-s)
-        (define-key evil-inner-text-objects-map "Z" #'evil-snipe-X)
-        (define-key evil-outer-text-objects-map "Z" #'evil-snipe-S)
-        (evil-snipe-override-mode 1)
-        (evil-snipe-mode 1)))
     (use-package evil-surround
       :config (global-evil-surround-mode 1))
     (use-package evil-leader

    (add-hook 'python-mode-hook     #'hs-minor-mode))
  :diminish hs-minor-mode)

(use-package avy :defer 3)

;; N.B. evil-mode must be enabled after global-evil-leader-mode
(use-package evil

          "e" #'pp-eval-last-sexp
          "f" #'evil-avy-goto-char
          "g" #'evil-avy-goto-char-2
          "l" #'evil-avy-goto-char-in-line
          "m" #'projectile-compile-project
          "r" #'recompile
          "s" #'me:use-evil-selection-register
          "v" #'exchange-point-and-mark
          "w" #'save-buffer
          "x" #'kill-buffer)))
    (use-package powerline-evil
      :init
      (progn
