  '(sgml-basic-offset 4)
  '(tab-width 4)
  '(warning-suppress-types (quote ((undo discard-info))))
- '(whitespace-global-modes (quote (makefile-gmake-mode)))
+ '(whitespace-global-modes (quote (makefile-gmake-mode\ python-mode)))
  '(whitespace-style (quote (face tabs space-before-tab)))
  '(window-combination-resize t)
  '(window-numbering-auto-assign-0-to-minibuffer t)

  :ensure t
  :init (progn
		  (elpy-enable)
		  ;; this isn't right, it wants to be in python-mode-hook so it's buffer-local
		  (whitespace-mode 1)
		  )
  ;; :mode (".in" python-mode)
  :bind (
		 ("H-m" . my-list-methods)
		 ("H-i" . my-jump-to-imports)

            (lambda ()
                  (interactive)
                  (join-line -1)))
(global-set-key (kbd "H-o") (lambda () (interactive)   (if (null minimap-bufname)
      (minimap-create)
    (minimap-kill))))
