diff --git a/.gitmodules b/.gitmodules
index 3292963d..78f9282e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "themes/zenburn"]
 	path = themes/zenburn
 	url = https://github.com/bbatsov/zenburn-emacs
+[submodule "emacs-for-python"]
+	path = emacs-for-python
+	url = git@github.com:gabrielelanaro/emacs-for-python.git
diff --git a/emacs-for-python b/emacs-for-python
new file mode 160000
index 00000000..50c3b1e9
--- /dev/null
+++ b/emacs-for-python
@@ -0,0 +1 @@
+Subproject commit 50c3b1e9bb1afe561666ec9c9b627763c313e910
diff --git a/init.el b/init.el
index 7a22a390..682973e5 100644
--- a/init.el
+++ b/init.el
@@ -34,9 +34,6 @@
 (ido-mode t)
 (setq ido-enable-flex-matching t)
 
-;; Code Completion.
-(require 'yasnippet-bundle)
-
 ;; Give duplicate open buffers better titles.
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'forward)
@@ -180,3 +177,5 @@
  '(rainbow-delimiters-depth-7-face ((t (:foreground "blue"))))
  '(rainbow-delimiters-depth-8-face ((t (:foreground "yellow"))))
  '(rainbow-delimiters-depth-9-face ((t (:foreground "magenta")))))
+
+ (load-file "~/.emacs.d/emacs-for-python/epy-init.el")