   "gt" 'smerge-keep-other ; "keep the one where my cursor isn't"
   "gn" 'smerge-next ; This should probably variously do smerge-next, magit-blame-next, etc
   "gp" 'smerge-prev
-
-  "hl" 'hs-hide-level
-  ;; "hL" 'hs-hide-level-recursive  ; Recursive version doesn't work like I think
   "ii" 'insert-char
-
   ;; (l)aunch application modes like dired, proced, ansi-term, et al
   "ld" 'dired
   "lp" 'proced
   "nm" 'linum-mode
   "nn" 'linum-relative-toggle
-
-  ;; Packages and pianobar (not that I've been using pianobar much)
   "pi" 'package-install
-  "pl" 'paradox-list-packages  ;; paradox shadows 'package-list-packages
+  "pl" 'paradox-list-packages
+  ;; "pl" 'package-list-packages
   "po" 'pianobar
   "pn" 'pianobar-next-song
   "pp" 'pianobar-play-or-pause
-
-  ;; Region-like bindings
+  "sb" 'eval-buffer
   "rc" 'comment-region
   "rt" 'indent-region
   "ru" 'uncomment-region
-
-  ;; Evaluation-like bindings
-  "sb" 'eval-buffer
   "sd" 'transpose-sexps
   "sf" 'browse-url-of-file
   "sl" 'eval-last-sexp
   "so" 'browse-url
   "ss" 'eval-defun ;because eval-defun is *totally* a synonym for 'eval-this-sexp... dammit emacs
-  "tf" 'transpose-frame  ; Deprecated, moving frame manipulations to 'f<char>
+  "tf" 'transpose-frame
   "tt" 'my-run-pytest-from-buffer-name
   "ta" 'pytest-all
   ; Not sure this next one is a good idea - \z works to enter emacs mode, but not to leave it.
-
-  ;; Window operations
   "wf" 'toggle-frame-fullscreen
   "wh" 'other-frame
   "wk" 'delete-window
   "wl" 'reverse-other-frame
-  "wm" 'maximize-this-window
   "wn" 'make-frame
   "[" 'keyboard-quit
   )

 'ibuffer-mode
 'completion-list-mode
 )

(add-hook 'git-commit-mode-hook 'evil-insert-state)

;; (set-evil-initial-mode
;;  'emacs ; Start the following modes in 'emacs state.
;;  '(ansi-term
;;    docker-container-mode
;;    docker-image-mode
;;    docker-machine-mode
;;    docker-network-mode
;;    docker-volume-mode
;;    messages-buffer-mode
;;    multi-term
;;    package-menu-mode
;;    eshell))


;; Mode registration should be a mode config thing, not an evil config
;; thing. Of course first, it needs to be a _working_ thing.
(add-to-list 'evil-emacs-state-modes 'magit-blame-mode)
(add-to-list 'evil-emacs-state-modes 'messages-buffer-mode)
(add-to-list 'evil-emacs-state-modes 'eshell)
;;(add-to-list 'evil-emacs-state-modes 'docker-image-mode) ; moved to docker config
;;(set-evil-initial-mode 'ansi-term 'emacs)

(provide 'config-evil)
;;; config-evil.el ends here

  "du" 'describe-face
  "dv" 'describe-variable
  ;;"dw" 'apropos ; Doesn't autofill object at point sadly
  "ee" 'find-file-at-point
  "fb" 'flycheck-buffer ; http://www.flycheck.org/
  "ff" 'flycheck-buffer
  "fl" 'flycheck-list-errors
  "fn" 'flycheck-next-error
  "fN" 'flycheck-previous-error
  "gb" 'magit-blame-start-or-quit
  "gf" 'find-file-at-point
  "gg" 'magit-status
