diff --git a/.gitignore b/.gitignore
index 10035e50..9733e901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ bookmarks
 
 elpa/*
 .dir-locals.el
-.mc-lists.el
\ No newline at end of file
+.mc-lists.el
+.python-environments/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index d6bd2a8a..094dea46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "lisp/multi-line-it"]
 	path = lisp/multi-line-it
 	url = git@github.com:IvanMalison/multi-line-it.git
-[submodule "emacs-for-python"]
-	path = emacs-for-python
-	url = git@github.com:IvanMalison/emacs-for-python.git
 [submodule "lisp/emacs-testify"]
 	path = lisp/emacs-testify
 	url = git@github.com:IvanMalison/emacs-testify.git
diff --git a/emacs-for-python b/emacs-for-python
deleted file mode 160000
index 05bcfda8..00000000
--- a/emacs-for-python
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05bcfda8dd280bdb10606f4e68ef1f0d17b49987
diff --git a/init.el b/init.el
index dbb42ef6..fc44eeb4 100644
--- a/init.el
+++ b/init.el
@@ -34,7 +34,7 @@
              '("marmalade" . "http://marmalade-repo.org/packages/")) 
 (package-initialize)
 
-(defvar my-packages '(color-theme ctags ctags-update evil flymake mo-git-blame
+(defvar my-packages '(color-theme ctags ctags-update flymake mo-git-blame
 				  multiple-cursors no-easy-keys
                                   starter-kit-bindings starter-kit-ruby
                                   starter-kit magit ido-ubiquitous
@@ -42,7 +42,7 @@
                                   paredit inf-ruby undo-tree rainbow-delimiters
                                   smex solarized-theme zenburn-theme
                                   scala-mode2 ensime monokai-theme
-                                  gitconfig-mode)
+                                  gitconfig-mode jedi flymake-cursor pytest)
   "Packages that must be installed at launch.")
 
 (defun ensure-package-installed (packages)
@@ -79,7 +79,6 @@ Return a list of installed packages or nil for every package not installed."
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'forward)
 
-(add-hook 'python-mode-hook (lambda () (setq show-trailing-whitespace t)))
 (setq visible-bell t)
 
 ;; Display line and column numbers in mode line.
@@ -180,6 +179,9 @@ Return a list of installed packages or nil for every package not installed."
 ;; Multi-lining for python.
 (require 'multi-line-it)
 (require 'emacs-testify)
+(require 'pytest)
+
+(add-hook 'python-mode-hook (lambda () (setq show-trailing-whitespace t)))
 
 (defun python-tabs () (setq tab-width 4
                             indent-tabs-mode t
@@ -195,7 +197,7 @@ Return a list of installed packages or nil for every package not installed."
 ;; =============================================================================
 
 (add-hook 'js-mode-common-hook (lambda () (subword-mode 1)))
-
+(add-hook 'js-mode (lambda () (subword-mode 1)))
 
 ;; =============================================================================
 ;;                                                                         Scala
@@ -207,7 +209,7 @@ Return a list of installed packages or nil for every package not installed."
 ;;                                                                  Starter Kits
 ;; =============================================================================
 
-(load-file "~/.emacs.d/emacs-for-python/epy-init.el")
+;;(load-file "~/.emacs.d/emacs-for-python/epy-init.el")
 
 (setq skeleton-pair nil) ;; This stuff sucks.
 
@@ -242,7 +244,7 @@ Return a list of installed packages or nil for every package not installed."
 (global-set-key (kbd "C-c +") 'message-buffer-name)
 
 ;; Something will occasionally override this binding.
-(global-set-key "\C-cg" 'rope-goto-definition)
+(global-set-key "\C-cg" 'jedi:goto-definition)
 
 ;; Macros
 (fset 'ipdb "import ipdb; ipdb.set_trace()")
diff --git a/lisp/flymake-cursor b/lisp/flymake-cursor
deleted file mode 160000
index 5cac5045..00000000
--- a/lisp/flymake-cursor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5cac5045398b1436ceb143d48961b50d38ae1396