diff --git a/emacs.d/elpa/elpy-1.2.0/LICENSE b/emacs.d/elpa/elpy-1.2.1/LICENSE
similarity index 100%
rename from emacs.d/elpa/elpy-1.2.0/LICENSE
rename to emacs.d/elpa/elpy-1.2.1/LICENSE
diff --git a/emacs.d/elpa/elpy-1.2.0/README b/emacs.d/elpa/elpy-1.2.1/README
similarity index 100%
rename from emacs.d/elpa/elpy-1.2.0/README
rename to emacs.d/elpa/elpy-1.2.1/README
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-autoloads.el b/emacs.d/elpa/elpy-1.2.1/elpy-autoloads.el
similarity index 95%
rename from emacs.d/elpa/elpy-1.2.0/elpy-autoloads.el
rename to emacs.d/elpa/elpy-1.2.1/elpy-autoloads.el
index 6aa8840..af9ad2b 100644
--- a/emacs.d/elpa/elpy-1.2.0/elpy-autoloads.el
+++ b/emacs.d/elpa/elpy-1.2.1/elpy-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (elpy-mode elpy-disable elpy-enable) "elpy" "elpy.el"
-;;;;;;  (21116 61707 0 0))
+;;;;;;  (21132 55281 0 0))
 ;;; Generated autoloads from elpy.el
 
 (autoload 'elpy-enable "elpy" "\
@@ -39,8 +39,8 @@ more structured list.
 
 ;;;***
 
-;;;### (autoloads nil nil ("elpy-pkg.el" "elpy-refactor.el") (21116
-;;;;;;  61707 359801 0))
+;;;### (autoloads nil nil ("elpy-pkg.el" "elpy-refactor.el") (21132
+;;;;;;  55281 220123 0))
 
 ;;;***
 
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.el b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.el
similarity index 93%
rename from emacs.d/elpa/elpy-1.2.0/elpy-pkg.el
rename to emacs.d/elpa/elpy-1.2.1/elpy-pkg.el
index 2af894a..3aa8c12 100644
--- a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.el
+++ b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.el
@@ -1,4 +1,4 @@
-(define-package "elpy" "1.2.0"
+(define-package "elpy" "1.2.1"
                 "Emacs Python Development Environment"
                 '((auto-complete "1.4")
                   (find-file-in-project "3.2")
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.elc b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.elc
similarity index 72%
rename from emacs.d/elpa/elpy-1.2.0/elpy-pkg.elc
rename to emacs.d/elpa/elpy-1.2.1/elpy-pkg.elc
index 4035085..6921071 100644
Binary files a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.elc and b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.elc differ
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-refactor.el b/emacs.d/elpa/elpy-1.2.1/elpy-refactor.el
similarity index 96%
rename from emacs.d/elpa/elpy-1.2.0/elpy-refactor.el
rename to emacs.d/elpa/elpy-1.2.1/elpy-refactor.el
index 1be4a26..27f9842 100644
--- a/emacs.d/elpa/elpy-1.2.0/elpy-refactor.el
+++ b/emacs.d/elpa/elpy-1.2.1/elpy-refactor.el
@@ -264,17 +264,21 @@ The user can review the changes and confirm them with
   "Get a list of refactoring options from the Elpy RPC."
   (if (use-region-p)
       (elpy-rpc "get_refactor_options"
-                (elpy-project-root) (buffer-file-name)
-                (1- (region-beginning)) (1- (region-end)))
+                (list (elpy-project-root)
+                      (buffer-file-name)
+                      (1- (region-beginning))
+                      (1- (region-end))))
     (elpy-rpc "get_refactor_options"
-              (elpy-project-root) (buffer-file-name)
-              (1- (point)))))
+              (list (elpy-project-root)
+                    (buffer-file-name)
+                    (1- (point))))))
 
 (defun elpy-refactor-rpc-get-changes (method args)
   "Get a list of changes from the Elpy RPC after applying METHOD with ARGS."
   (elpy-rpc "refactor"
-            (elpy-project-root) (buffer-file-name)
-            method args))
+            (list (elpy-project-root)
+                  (buffer-file-name)
+                  method args)))
 
 (provide 'elpy-refactor)
 ;;; elpy-refactor.el ends here
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-refactor.elc b/emacs.d/elpa/elpy-1.2.1/elpy-refactor.elc
similarity index 90%
rename from emacs.d/elpa/elpy-1.2.0/elpy-refactor.elc
rename to emacs.d/elpa/elpy-1.2.1/elpy-refactor.elc
index 65b5d5f..72304e4 100644
Binary files a/emacs.d/elpa/elpy-1.2.0/elpy-refactor.elc and b/emacs.d/elpa/elpy-1.2.1/elpy-refactor.elc differ
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy.el b/emacs.d/elpa/elpy-1.2.1/elpy.el
similarity index 97%
rename from emacs.d/elpa/elpy-1.2.0/elpy.el
rename to emacs.d/elpa/elpy-1.2.1/elpy.el
index f9d3616..ca17843 100644
--- a/emacs.d/elpa/elpy-1.2.0/elpy.el
+++ b/emacs.d/elpa/elpy-1.2.1/elpy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
 ;; URL: https://github.com/jorgenschaefer/elpy
-;; Version: 1.2.0
+;; Version: 1.2.1
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -104,7 +104,7 @@ These are prepended to `grep-find-ignored-directories'."
   "Hook run when `elpy-mode' is enabled."
   :group 'elpy)
 
-(defconst elpy-version "1.2.0"
+(defconst elpy-version "1.2.1"
   "The version of the Elpy lisp code.")
 
 (defun elpy-version ()
@@ -393,7 +393,7 @@ This should be run from `python-mode-hook'."
         (set (make-local-variable 'flymake-warning-predicate) "^W[0-9]")
       (set (make-local-variable 'flymake-warning-re) "^W[0-9]"))))
 
-(defvar elpy-project-root 'not-initialized
+(defvar elpy-project-root nil
   "The root of the project the current buffer is in.")
 (make-variable-buffer-local 'elpy-project-root)
 (put 'elpy-project-root 'safe-local-variable 'file-directory-p)
@@ -403,28 +403,27 @@ This should be run from `python-mode-hook'."
 
 You can set the variable `elpy-project-root' in, for example,
 .dir-locals.el to configure this."
-  (when (eq elpy-project-root 'not-initialized)
-    (setq elpy-project-root (elpy-project--find-root)))
+  (when (not elpy-project-root)
+    (setq elpy-project-root (elpy-project--find-root))
+    (when (equal (directory-file-name (expand-file-name default-directory))
+                 (directory-file-name (expand-file-name "~")))
+      (display-warning 'elpy
+                       (concat "Project root set to your home directory; "
+                               "this can slow down operation considerably")
+                       :warning)))
   elpy-project-root)
 
-(defun elpy-project--find-root (&optional skip-current-directory)
+(defun elpy-project--find-root ()
   "Find the first directory in the tree not containing an __init__.py
 
 If there is no __init__.py in the current directory, return the
-current directory unless SKIP-CURRENT-DIRECTORY is non-nil."
-  (cond
-   ((file-exists-p (format "%s/__init__.py" default-directory))
-    (locate-dominating-file default-directory
-                            (lambda (dir)
-                              (not (file-exists-p
-                                    (format "%s/__init__.py" dir))))))
-   ;; Don't return the user's home. That's never a good project root.
-   ((and (not skip-current-directory)
-         (not (equal (directory-file-name (expand-file-name default-directory))
-                     (directory-file-name (expand-file-name "~")))))
-    default-directory)
-   (t
-    nil)))
+current directory."
+  (if (file-exists-p (format "%s/__init__.py" default-directory))
+      (locate-dominating-file default-directory
+                              (lambda (dir)
+                                (not (file-exists-p
+                                      (format "%s/__init__.py" dir)))))
+    default-directory))
 
 (defun elpy-set-project-root (new-root)
   "Set the Elpy project root to NEW-ROOT."
@@ -992,6 +991,11 @@ creating one if necessary."
                               elpy-rpc-python-command)))
     elpy-rpc--buffer)))
 
+(defun elpy-rpc--get-rpc-process ()
+  "Return the RPC process associated with the current buffer,
+creating one if necessary."
+  (get-buffer-process (elpy-rpc--get-rpc-buffer)))
+
 (defun elpy-rpc--find-buffer (project-root python-command)
   "Return an existing RPC buffer for this project root and command."
   (let ((result nil))
@@ -1226,7 +1230,8 @@ Returns the result, blocking until this arrived."
                                end-time)
                   (not (or result-arrived
                            error-occured)))
-        (accept-process-output nil elpy-rpc--timeout 10)))
+        (accept-process-output (elpy-rpc--get-rpc-process)
+                               elpy-rpc--timeout)))
     (cond
      (error-occured
       (error error-string))
@@ -1412,13 +1417,6 @@ description."
     (message "%s" text)))
 
 
-;;;;;;;;
-;;; nose
-
-(eval-after-load "nose"
-  '(defalias 'nose-find-project-root 'elpy-project--find-root))
-
-
 ;;;;;;;;;;;;;
 ;;; Yasnippet
 
@@ -1530,6 +1528,14 @@ This uses `elpy--ac-cache'."
   (defun python-shell-parse-command ()
     "Compatibility function for older Emacsen."
     python-python-command))
+(when (not (fboundp 'python-shell-calculate-process-environment))
+  (defun python-shell-calculate-process-environment ()
+    "Compatibility function for older Emacsen."
+    process-environment))
+(when (not (fboundp 'python-shell-calculate-exec-path))
+  (defun python-shell-calculate-exec-path ()
+    "Compatibility function for older Emacsen."
+    exec-path))
 
 ;; Emacs 24.2 made `locate-dominating-file' accept a predicate instead
 ;; of a string. Simply overwrite the current one, it's
diff --git a/emacs.d/elpa/elpy-1.2.0/elpy.elc b/emacs.d/elpa/elpy-1.2.1/elpy.elc
similarity index 83%
rename from emacs.d/elpa/elpy-1.2.0/elpy.elc
rename to emacs.d/elpa/elpy-1.2.1/elpy.elc
index b7fbc9a..09f7503 100644
Binary files a/emacs.d/elpa/elpy-1.2.0/elpy.elc and b/emacs.d/elpa/elpy-1.2.1/elpy.elc differ
diff --git a/emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__enter__ b/emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__enter__
similarity index 100%
rename from emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__enter__
rename to emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__enter__
diff --git a/emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__exit__ b/emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__exit__
similarity index 100%
rename from emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__exit__
rename to emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__exit__
diff --git a/emacs.d/elpa/elpy-1.2.0/snippets/python-mode/super b/emacs.d/elpa/elpy-1.2.1/snippets/python-mode/super
similarity index 100%
rename from emacs.d/elpa/elpy-1.2.0/snippets/python-mode/super
rename to emacs.d/elpa/elpy-1.2.1/snippets/python-mode/super