   (define-key company-active-map (kbd "M-p") nil)
   (define-key company-active-map (kbd "C-n") #'company-select-next)
   (define-key company-active-map (kbd "C-p") #'company-select-previous))
-
-;; jedi:setup, replaced by anaconda-mode
-; (add-hook 'python-mode-hook 'jedi:setup)
-; (setq jedi:complete-on-dot t)
-; (setq jedi:get-in-function-call-delay 10)
 
 (when (eq system-type 'darwin) ;; mac specific settings
 

(prefer-coding-system 'utf-8)
(put 'upcase-region 'disabled nil)  ; C-x C-u


;; expand-region
(require 'expand-region)
(global-set-key (kbd "M-+") 'er/expand-region)

(el-get-install 'neotree)
(el-get-install 'js2-mode)
(el-get-install 'switch-window)
(el-get-install 'magit)

;; company-mode
(setq company-idle-delay 0)  ; autocomplete delay
(setq company-minimum-prefix-length 2)

(add-hook 'after-init-hook 'global-company-mode)
(add-hook 'python-mode-hook 'anaconda-mode
  (lambda ()
