diff --git a/ctrl-caps-swap.map b/ctrl-caps-swap.map
new file mode 100644
index 0000000..484b11b
--- /dev/null
+++ b/ctrl-caps-swap.map
@@ -0,0 +1,2 @@
+keycode 58 = Control
+
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 60436a9..62be3db 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -170,6 +170,14 @@
 (load-file "~/.emacs.d/package.el")
 
 ;;--------------------------------------------------------------------------------------
+;; Jedi Completion for Python
+;;--------------------------------------------------------------------------------------
+
+(add-hook 'python-mode-hook 'jedi:setup)
+(setq jedi:complete-on-dot t)
+
+
+;;--------------------------------------------------------------------------------------
 ;; Enable ParEdit for Emacs lisp modes
 ;;--------------------------------------------------------------------------------------
 
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index 43a65a4..1cda417 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -9,6 +9,7 @@
                       irony
                       counsel
                       swiper
+                      jedi
                       ;;;;;;;;;;;;;;;;;;;;;;;;
 
                       ;; Programming modes