             (define-key python-mode-map (kbd "\C-c RET")
               (lambda()(interactive)
                 (compile (concat "python " (buffer-name)))))
-            (define-key python-mode-map "\C-cx" 'jedi-direx:pop-to-buffer)
+            (when (featurep 'jedi)
+              (define-key python-mode-map [(ctrl tab)] 'my/expand-jedi)
+              (define-key python-mode-map "\C-cx" 'jedi-direx:pop-to-buffer))
             ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; emacs-lisp-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

      (require 'jedi-direx)
      (add-hook 'jedi-mode-hook 'jedi-direx:setup)
      (add-hook 'python-mode-hook 'jedi:setup)
      )
    (unless (executable-find "flake8")
      (add-to-list 'flycheck-disabled-checkers 'python-flake8)

;; Author: Dan Harms <danielrharms@gmail.com>
;; Created: Friday, February 27, 2015
;; Version: 1.0
;; Modified Time-stamp: <2015-12-31 16:09:47 dan.harms>
;; Modified by: Dan Harms
;; Keywords:

