diff --git a/elpa/async-20160711.2235/async-autoloads.el b/elpa/async-20161010.2322/async-autoloads.el
similarity index 87%
rename from elpa/async-20160711.2235/async-autoloads.el
rename to elpa/async-20161010.2322/async-autoloads.el
index 40c8f8a..e5ee731 100644
--- a/elpa/async-20160711.2235/async-autoloads.el
+++ b/elpa/async-20161010.2322/async-autoloads.el
@@ -1,9 +1,9 @@
 ;;; async-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "async" "async.el" (22404 60275 161929 555000))
+;;;### (autoloads nil "async" "async.el" (22525 59329 588470 914000))
 ;;; Generated autoloads from async.el
 
 (autoload 'async-start-process "async" "\
@@ -68,8 +68,8 @@ returns nil.  It can still be useful, however, as an argument to
 
 ;;;***
 
-;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22404
-;;;;;;  60275 153929 514000))
+;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22525
+;;;;;;  59329 584470 885000))
 ;;; Generated autoloads from async-bytecomp.el
 
 (autoload 'async-byte-recompile-directory "async-bytecomp" "\
@@ -80,7 +80,8 @@ All *.elc files are systematically deleted before proceeding.
 
 (defvar async-bytecomp-package-mode nil "\
 Non-nil if Async-Bytecomp-Package mode is enabled.
-See the command `async-bytecomp-package-mode' for a description of this minor mode.
+See the `async-bytecomp-package-mode' command
+for a description of this minor mode.
 Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `async-bytecomp-package-mode'.")
@@ -96,13 +97,14 @@ Async compilation of packages can be controlled by
 
 ;;;***
 
-;;;### (autoloads nil "dired-async" "dired-async.el" (22404 60275
-;;;;;;  137929 430000))
+;;;### (autoloads nil "dired-async" "dired-async.el" (22525 59329
+;;;;;;  572470 801000))
 ;;; Generated autoloads from dired-async.el
 
 (defvar dired-async-mode nil "\
 Non-nil if Dired-Async mode is enabled.
-See the command `dired-async-mode' for a description of this minor mode.
+See the `dired-async-mode' command
+for a description of this minor mode.
 Setting this variable directly does not take effect;
 either customize it (see the info node `Easy Customization')
 or call the function `dired-async-mode'.")
@@ -116,8 +118,8 @@ Do dired actions asynchronously.
 
 ;;;***
 
-;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22404
-;;;;;;  60275 190952 741000))
+;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22525
+;;;;;;  59329 592470 942000))
 
 ;;;***
 
diff --git a/elpa/async-20160711.2235/async-bytecomp.el b/elpa/async-20161010.2322/async-bytecomp.el
similarity index 100%
rename from elpa/async-20160711.2235/async-bytecomp.el
rename to elpa/async-20161010.2322/async-bytecomp.el
diff --git a/elpa/async-20160711.2235/async-pkg.el b/elpa/async-20161010.2322/async-pkg.el
similarity index 68%
rename from elpa/async-20160711.2235/async-pkg.el
rename to elpa/async-20161010.2322/async-pkg.el
index 56db0c0..62214d0 100644
--- a/elpa/async-20160711.2235/async-pkg.el
+++ b/elpa/async-20161010.2322/async-pkg.el
@@ -1,4 +1,4 @@
-(define-package "async" "20160711.2235" "Asynchronous processing in Emacs" 'nil :keywords
+(define-package "async" "20161010.2322" "Asynchronous processing in Emacs" 'nil :keywords
   '("async")
   :url "https://github.com/jwiegley/emacs-async")
 ;; Local Variables:
diff --git a/elpa/async-20160711.2235/async.el b/elpa/async-20161010.2322/async.el
similarity index 100%
rename from elpa/async-20160711.2235/async.el
rename to elpa/async-20161010.2322/async.el
diff --git a/elpa/async-20160711.2235/dired-async.el b/elpa/async-20161010.2322/dired-async.el
similarity index 99%
rename from elpa/async-20160711.2235/dired-async.el
rename to elpa/async-20161010.2322/dired-async.el
index d0de789..ed37953 100644
--- a/elpa/async-20160711.2235/dired-async.el
+++ b/elpa/async-20161010.2322/dired-async.el
@@ -262,7 +262,7 @@ ESC or `q' to not overwrite any of the remaining files,
                           for destp = (file-exists-p to)
                           do (and bf destp
                                   (with-current-buffer bf
-                                    (set-visited-file-name to nil t))))))))
+                                    (set-visited-file-name to t t))))))))
     ;; Start async process.
     (when async-fn-list
       (async-start `(lambda ()
diff --git a/elpa/async-20160711.2235/smtpmail-async.el b/elpa/async-20161010.2322/smtpmail-async.el
similarity index 100%
rename from elpa/async-20160711.2235/smtpmail-async.el
rename to elpa/async-20161010.2322/smtpmail-async.el
diff --git a/elpa/magit-20161009.1658/AUTHORS.md b/elpa/magit-20161011.1700/AUTHORS.md
similarity index 100%
rename from elpa/magit-20161009.1658/AUTHORS.md
rename to elpa/magit-20161011.1700/AUTHORS.md
diff --git a/elpa/magit-20161009.1658/COPYING b/elpa/magit-20161011.1700/COPYING
similarity index 100%
rename from elpa/magit-20161009.1658/COPYING
rename to elpa/magit-20161011.1700/COPYING
diff --git a/elpa/magit-20161009.1658/dir b/elpa/magit-20161011.1700/dir
similarity index 100%
rename from elpa/magit-20161009.1658/dir
rename to elpa/magit-20161011.1700/dir
diff --git a/elpa/magit-20161009.1658/git-rebase.el b/elpa/magit-20161011.1700/git-rebase.el
similarity index 100%
rename from elpa/magit-20161009.1658/git-rebase.el
rename to elpa/magit-20161011.1700/git-rebase.el
diff --git a/elpa/magit-20161009.1658/magit-apply.el b/elpa/magit-20161011.1700/magit-apply.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-apply.el
rename to elpa/magit-20161011.1700/magit-apply.el
diff --git a/elpa/magit-20161009.1658/magit-autoloads.el b/elpa/magit-20161011.1700/magit-autoloads.el
similarity index 97%
rename from elpa/magit-20161009.1658/magit-autoloads.el
rename to elpa/magit-20161011.1700/magit-autoloads.el
index 4c427ba..1300c38 100644
--- a/elpa/magit-20161009.1658/magit-autoloads.el
+++ b/elpa/magit-20161011.1700/magit-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "git-rebase" "git-rebase.el" (22523 21243 636405
-;;;;;;  758000))
+;;;### (autoloads nil "git-rebase" "git-rebase.el" (22525 59336 620520
+;;;;;;  53000))
 ;;; Generated autoloads from git-rebase.el
 
 (autoload 'git-rebase-mode "git-rebase" "\
@@ -23,7 +23,7 @@ running 'man git-rebase' at the command line) for details.
 
 ;;;***
 
-;;;### (autoloads nil "magit" "magit.el" (22523 21243 716406 348000))
+;;;### (autoloads nil "magit" "magit.el" (22525 59336 712520 692000))
 ;;; Generated autoloads from magit.el
 
 (autoload 'magit-status "magit" "\
@@ -501,8 +501,8 @@ Git, and Emacs in the echo area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-apply" "magit-apply.el" (22523 21243
-;;;;;;  656405 906000))
+;;;### (autoloads nil "magit-apply" "magit-apply.el" (22525 59336
+;;;;;;  648520 248000))
 ;;; Generated autoloads from magit-apply.el
 
 (autoload 'magit-stage-file "magit-apply" "\
@@ -538,8 +538,8 @@ Remove all changes from the staging area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22523
-;;;;;;  21243 588405 405000))
+;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22525
+;;;;;;  59336 588519 830000))
 ;;; Generated autoloads from magit-autorevert.el
 
 (defvar magit-revert-buffers t)
@@ -568,8 +568,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
 
 ;;;***
 
-;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22523 21243
-;;;;;;  652405 876000))
+;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22525 59336
+;;;;;;  640520 192000))
 ;;; Generated autoloads from magit-bisect.el
  (autoload 'magit-bisect-popup "magit-bisect" nil t)
 
@@ -620,8 +620,8 @@ bisect run'.
 
 ;;;***
 
-;;;### (autoloads nil "magit-blame" "magit-blame.el" (22523 21243
-;;;;;;  704406 260000))
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (22525 59336
+;;;;;;  700520 609000))
 ;;; Generated autoloads from magit-blame.el
  (autoload 'magit-blame-popup "magit-blame" nil t)
 
@@ -645,8 +645,8 @@ only arguments available from `magit-blame-popup' should be used.
 
 ;;;***
 
-;;;### (autoloads nil "magit-commit" "magit-commit.el" (22523 21243
-;;;;;;  604405 523000))
+;;;### (autoloads nil "magit-commit" "magit-commit.el" (22525 59336
+;;;;;;  592519 858000))
 ;;; Generated autoloads from magit-commit.el
 
 (autoload 'magit-commit "magit-commit" "\
@@ -728,8 +728,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
 
 ;;;***
 
-;;;### (autoloads nil "magit-diff" "magit-diff.el" (22523 21243 696406
-;;;;;;  200000))
+;;;### (autoloads nil "magit-diff" "magit-diff.el" (22525 59336 696520
+;;;;;;  581000))
 ;;; Generated autoloads from magit-diff.el
 
 (autoload 'magit-diff-popup "magit-diff" "\
@@ -813,8 +813,8 @@ for a revision.
 
 ;;;***
 
-;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22523 21243
-;;;;;;  684406 112000))
+;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22525 59336
+;;;;;;  684520 498000))
 ;;; Generated autoloads from magit-ediff.el
  (autoload 'magit-ediff-popup "magit-ediff" nil t)
 
@@ -902,8 +902,8 @@ stash that were staged.
 
 ;;;***
 
-;;;### (autoloads nil "magit-extras" "magit-extras.el" (22523 21243
-;;;;;;  608405 552000))
+;;;### (autoloads nil "magit-extras" "magit-extras.el" (22525 59336
+;;;;;;  596519 887000))
 ;;; Generated autoloads from magit-extras.el
 
 (autoload 'magit-run-git-gui "magit-extras" "\
@@ -973,8 +973,8 @@ on a position in a file-visiting buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-log" "magit-log.el" (22523 21243 692406
-;;;;;;  171000))
+;;;### (autoloads nil "magit-log" "magit-log.el" (22525 59336 692520
+;;;;;;  553000))
 ;;; Generated autoloads from magit-log.el
 
 (autoload 'magit-log-buffer-file-popup "magit-log" "\
@@ -1056,8 +1056,8 @@ Show commits in a branch that are not merged in the upstream branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-remote" "magit-remote.el" (22523 21243
-;;;;;;  740406 526000))
+;;;### (autoloads nil "magit-remote" "magit-remote.el" (22525 59336
+;;;;;;  728520 804000))
 ;;; Generated autoloads from magit-remote.el
 
 (autoload 'magit-clone "magit-remote" "\
@@ -1289,8 +1289,8 @@ is asked to pull.  START has to be reachable from that commit.
 
 ;;;***
 
-;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22523
-;;;;;;  21243 724406 407000))
+;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22525
+;;;;;;  59336 716520 720000))
 ;;; Generated autoloads from magit-sequence.el
 
 (autoload 'magit-sequencer-continue "magit-sequence" "\
@@ -1440,8 +1440,8 @@ Abort the current rebase operation, restoring the original branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-stash" "magit-stash.el" (22523 21243
-;;;;;;  672406 24000))
+;;;### (autoloads nil "magit-stash" "magit-stash.el" (22525 59336
+;;;;;;  668520 386000))
 ;;; Generated autoloads from magit-stash.el
  (autoload 'magit-stash-popup "magit-stash" nil t)
 
@@ -1540,8 +1540,8 @@ Show all diffs of a stash in a buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22523
-;;;;;;  21243 760406 672000))
+;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22525
+;;;;;;  59336 744520 915000))
 ;;; Generated autoloads from magit-submodule.el
  (autoload 'magit-submodule-popup "magit-submodule" nil t)
 
@@ -1631,8 +1631,8 @@ Display a list of the current repository's submodules.
 
 ;;;***
 
-;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22523 21243
-;;;;;;  640405 788000))
+;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22525 59336
+;;;;;;  628520 107000))
 ;;; Generated autoloads from magit-subtree.el
  (autoload 'magit-subtree-popup "magit-subtree" nil t)
 
@@ -1668,8 +1668,8 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-wip" "magit-wip.el" (22523 21243 620405
-;;;;;;  640000))
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (22525 59336 608519
+;;;;;;  969000))
 ;;; Generated autoloads from magit-wip.el
 
 (defvar magit-wip-after-save-mode nil "\
@@ -1739,7 +1739,7 @@ command which is about to be called are committed.
 
 ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el"
 ;;;;;;  "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el")
-;;;;;;  (22523 21243 744406 555000))
+;;;;;;  (22525 59336 732520 832000))
 
 ;;;***
 
diff --git a/elpa/magit-20161009.1658/magit-autorevert.el b/elpa/magit-20161011.1700/magit-autorevert.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-autorevert.el
rename to elpa/magit-20161011.1700/magit-autorevert.el
diff --git a/elpa/magit-20161009.1658/magit-bisect.el b/elpa/magit-20161011.1700/magit-bisect.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-bisect.el
rename to elpa/magit-20161011.1700/magit-bisect.el
diff --git a/elpa/magit-20161009.1658/magit-blame.el b/elpa/magit-20161011.1700/magit-blame.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-blame.el
rename to elpa/magit-20161011.1700/magit-blame.el
diff --git a/elpa/magit-20161009.1658/magit-commit.el b/elpa/magit-20161011.1700/magit-commit.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-commit.el
rename to elpa/magit-20161011.1700/magit-commit.el
diff --git a/elpa/magit-20161009.1658/magit-core.el b/elpa/magit-20161011.1700/magit-core.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-core.el
rename to elpa/magit-20161011.1700/magit-core.el
diff --git a/elpa/magit-20161009.1658/magit-diff.el b/elpa/magit-20161011.1700/magit-diff.el
similarity index 99%
rename from elpa/magit-20161009.1658/magit-diff.el
rename to elpa/magit-20161011.1700/magit-diff.el
index 7dd7b02..295f90d 100644
--- a/elpa/magit-20161009.1658/magit-diff.el
+++ b/elpa/magit-20161011.1700/magit-diff.el
@@ -1065,8 +1065,7 @@ the buffer in another window."
                       (--when-let (car magit-refresh-args)
                         (and (string-match "\\.\\.\\([^.].*\\)?[ \t]*\\'" it)
                              (match-string 1 it))))
-                     ((derived-mode-p 'magit-status-mode)
-                      (magit-rev-name "HEAD"))))
+                     ))
           (unmerged-p (magit-anything-unmerged-p file))
           hunk line col buffer)
       (pcase (magit-diff-scope)
@@ -1083,6 +1082,8 @@ the buffer in another window."
         (`list
          (setq hunk (car (magit-section-children
                           (car (magit-section-children current)))))))
+      (when (and rev (magit-rev-head-p rev))
+        (setq rev nil))
       (when (and hunk
                  ;; Currently the `hunk' type is also abused for file
                  ;; mode changes.  Luckily such sections have no value.
@@ -1096,12 +1097,16 @@ the buffer in another window."
       (magit-display-file-buffer buffer)
       (with-current-buffer buffer
         (when line
-          (save-restriction
-            (widen)
-            (goto-char (point-min))
-            (forward-line (1- line))
-            (when col
-              (move-to-column col))))
+          (let ((pos (save-restriction
+                       (widen)
+                       (goto-char (point-min))
+                       (forward-line (1- line))
+                       (when col
+                         (move-to-column col))
+                       (point))))
+            (unless (<= (point-min) pos (point-max))
+              (widen)
+              (goto-char pos))))
         (when unmerged-p
           (smerge-start-session))
         (run-hooks 'magit-diff-visit-file-hook)))))
@@ -1151,9 +1156,12 @@ or `HEAD'."
          (stop   (line-number-at-pos))
          (cstart (save-excursion (goto-char cpos)
                                  (line-number-at-pos)))
-         (prior  (save-excursion (goto-char (line-beginning-position))
-                                 (looking-at "-")))
-         (line   (nth (if prior 1 2) value)))
+         (prior  (and (= (length value) 3)
+                      (save-excursion (goto-char (line-beginning-position))
+                                      (looking-at "-"))))
+         (line   (if prior
+                     (cadr value)
+                   (car (last value)))))
     (string-match (format "^%s\\([0-9]+\\)" (if prior "-" "\\+")) line)
     (setq line (string-to-number (match-string 1 line)))
     (when (> cstart stop)
diff --git a/elpa/magit-20161009.1658/magit-ediff.el b/elpa/magit-20161011.1700/magit-ediff.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-ediff.el
rename to elpa/magit-20161011.1700/magit-ediff.el
diff --git a/elpa/magit-20161009.1658/magit-extras.el b/elpa/magit-20161011.1700/magit-extras.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-extras.el
rename to elpa/magit-20161011.1700/magit-extras.el
diff --git a/elpa/magit-20161009.1658/magit-git.el b/elpa/magit-20161011.1700/magit-git.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-git.el
rename to elpa/magit-20161011.1700/magit-git.el
diff --git a/elpa/magit-20161009.1658/magit-log.el b/elpa/magit-20161011.1700/magit-log.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-log.el
rename to elpa/magit-20161011.1700/magit-log.el
diff --git a/elpa/magit-20161009.1658/magit-mode.el b/elpa/magit-20161011.1700/magit-mode.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-mode.el
rename to elpa/magit-20161011.1700/magit-mode.el
diff --git a/elpa/magit-20161009.1658/magit-pkg.el b/elpa/magit-20161011.1700/magit-pkg.el
similarity index 82%
rename from elpa/magit-20161009.1658/magit-pkg.el
rename to elpa/magit-20161011.1700/magit-pkg.el
index 243d48e..afde8d9 100644
--- a/elpa/magit-20161009.1658/magit-pkg.el
+++ b/elpa/magit-20161011.1700/magit-pkg.el
@@ -1,4 +1,4 @@
-(define-package "magit" "20161009.1658" "A Git porcelain inside Emacs"
+(define-package "magit" "20161011.1700" "A Git porcelain inside Emacs"
   '((emacs "24.4")
     (async "20160711.223")
     (dash "20160820.501")
diff --git a/elpa/magit-20161009.1658/magit-process.el b/elpa/magit-20161011.1700/magit-process.el
similarity index 99%
rename from elpa/magit-20161009.1658/magit-process.el
rename to elpa/magit-20161011.1700/magit-process.el
index 1f9ca41..b917a41 100644
--- a/elpa/magit-20161009.1658/magit-process.el
+++ b/elpa/magit-20161011.1700/magit-process.el
@@ -791,7 +791,8 @@ as argument."
           default-dir (process-get arg 'default-dir)
           section     (process-get arg 'section)
           arg         (process-exit-status arg)))
-  (magit-process-unset-mode-line)
+  (with-current-buffer process-buf
+    (magit-process-unset-mode-line))
   (when (featurep 'dired)
     (dired-uncache default-dir))
   (when (buffer-live-p process-buf)
@@ -866,8 +867,8 @@ as argument."
 
 ;;; magit-process.el ends soon
 
-(define-obsolete-variable-alias 'magit-git-output-coding-system
-  'magit-log-output-coding-system "Magit 2.9.0")
+(define-obsolete-variable-alias 'magit-log-output-coding-system
+  'magit-git-output-coding-system "Magit 2.9.0")
 
 (provide 'magit-process)
 ;; Local Variables:
diff --git a/elpa/magit-20161009.1658/magit-remote.el b/elpa/magit-20161011.1700/magit-remote.el
similarity index 98%
rename from elpa/magit-20161009.1658/magit-remote.el
rename to elpa/magit-20161011.1700/magit-remote.el
index b4d175f..d7053f0 100644
--- a/elpa/magit-20161009.1658/magit-remote.el
+++ b/elpa/magit-20161011.1700/magit-remote.el
@@ -559,9 +559,15 @@ Both the source and the target are read in the minibuffer."
   (interactive
    (let ((source (magit-read-local-branch-or-commit "Push")))
      (list source
-           (magit-read-remote-branch (format "Push %s to" source) nil
-                                     (magit-get-upstream-branch source)
-                                     source 'confirm)
+           (magit-read-remote-branch
+            (format "Push %s to" source) nil
+            (if (magit-local-branch-p source)
+                (or (magit-get-push-branch source)
+                    (magit-get-upstream-branch source))
+              (and (magit-rev-ancestor-p source "HEAD")
+                   (or (magit-get-push-branch)
+                       (magit-get-upstream-branch))))
+            source 'confirm)
            (magit-push-arguments))))
   (magit-git-push source target args))
 
diff --git a/elpa/magit-20161009.1658/magit-section.el b/elpa/magit-20161011.1700/magit-section.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-section.el
rename to elpa/magit-20161011.1700/magit-section.el
diff --git a/elpa/magit-20161009.1658/magit-sequence.el b/elpa/magit-20161011.1700/magit-sequence.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-sequence.el
rename to elpa/magit-20161011.1700/magit-sequence.el
diff --git a/elpa/magit-20161009.1658/magit-stash.el b/elpa/magit-20161011.1700/magit-stash.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-stash.el
rename to elpa/magit-20161011.1700/magit-stash.el
diff --git a/elpa/magit-20161009.1658/magit-submodule.el b/elpa/magit-20161011.1700/magit-submodule.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-submodule.el
rename to elpa/magit-20161011.1700/magit-submodule.el
diff --git a/elpa/magit-20161009.1658/magit-subtree.el b/elpa/magit-20161011.1700/magit-subtree.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-subtree.el
rename to elpa/magit-20161011.1700/magit-subtree.el
diff --git a/elpa/magit-20161009.1658/magit-utils.el b/elpa/magit-20161011.1700/magit-utils.el
similarity index 97%
rename from elpa/magit-20161009.1658/magit-utils.el
rename to elpa/magit-20161011.1700/magit-utils.el
index cc0ad82..79ca2ce 100644
--- a/elpa/magit-20161009.1658/magit-utils.el
+++ b/elpa/magit-20161011.1700/magit-utils.el
@@ -490,6 +490,22 @@ FORMAT-STRING to be displayed, then don't."
   (unless (--first (string-prefix-p it format-string) magit-no-message)
     (apply #'message format-string args)))
 
+(defvar whitespace-mode)
+
+(defun whitespace-dont-turn-on-in-magit-mode ()
+  "Prevent `whitespace-mode' from being turned on in Magit buffers.
+Because `whitespace-mode' uses font-lock and Magit does not,
+they are not compatible.  See `magit-diff-paint-whitespace'
+for an alternative."
+  (when (derived-mode-p 'magit-mode)
+    (setq whitespace-mode nil)
+    (user-error
+     "Whitespace-Mode isn't compatible with Magit.  %s"
+     "See `magit-diff-paint-whitespace' for an alternative.")))
+
+(advice-add 'whitespace-turn-on :before
+            'whitespace-dont-turn-on-in-magit-mode)
+
 ;;; magit-utils.el ends soon
 (provide 'magit-utils)
 ;; Local Variables:
diff --git a/elpa/magit-20161009.1658/magit-wip.el b/elpa/magit-20161011.1700/magit-wip.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit-wip.el
rename to elpa/magit-20161011.1700/magit-wip.el
diff --git a/elpa/magit-20161009.1658/magit.el b/elpa/magit-20161011.1700/magit.el
similarity index 100%
rename from elpa/magit-20161009.1658/magit.el
rename to elpa/magit-20161011.1700/magit.el
diff --git a/elpa/magit-20161009.1658/magit.info b/elpa/magit-20161011.1700/magit.info
similarity index 100%
rename from elpa/magit-20161009.1658/magit.info
rename to elpa/magit-20161011.1700/magit.info
diff --git a/elpa/magit-20161009.1658/magit.info-1 b/elpa/magit-20161011.1700/magit.info-1
similarity index 100%
rename from elpa/magit-20161009.1658/magit.info-1
rename to elpa/magit-20161011.1700/magit.info-1
diff --git a/elpa/magit-20161009.1658/magit.info-2 b/elpa/magit-20161011.1700/magit.info-2
similarity index 100%
rename from elpa/magit-20161009.1658/magit.info-2
rename to elpa/magit-20161011.1700/magit.info-2
diff --git a/elpa/magithub-20161004.523/magithub-autoloads.el b/elpa/magithub-20161011.2129/magithub-autoloads.el
similarity index 93%
rename from elpa/magithub-20161004.523/magithub-autoloads.el
rename to elpa/magithub-20161011.2129/magithub-autoloads.el
index 2b0d13a..2d8d892 100644
--- a/elpa/magithub-20161004.523/magithub-autoloads.el
+++ b/elpa/magithub-20161011.2129/magithub-autoloads.el
@@ -4,8 +4,8 @@
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
 ;;;### (autoloads nil nil ("magithub-cache.el" "magithub-ci.el" "magithub-core.el"
-;;;;;;  "magithub-issue.el" "magithub-pkg.el" "magithub.el") (22516
-;;;;;;  57895 765484 157000))
+;;;;;;  "magithub-issue.el" "magithub-pkg.el" "magithub.el") (22525
+;;;;;;  59330 912480 205000))
 
 ;;;***
 
diff --git a/elpa/magithub-20161004.523/magithub-cache.el b/elpa/magithub-20161011.2129/magithub-cache.el
similarity index 98%
rename from elpa/magithub-20161004.523/magithub-cache.el
rename to elpa/magithub-20161011.2129/magithub-cache.el
index 3c5ab5d..aa0694d 100644
--- a/elpa/magithub-20161004.523/magithub-cache.el
+++ b/elpa/magithub-20161011.2129/magithub-cache.el
@@ -81,7 +81,7 @@ If CACHE is nil, the entire cache is cleared."
 (defun magithub-refresh ()
   "Refresh all GitHub data."
   (interactive)
-  (magithub-cache-clear)
+  (magithub-cache-clear (magithub-repo-id))
   (magit-refresh))
 
 (provide 'magithub-cache)
diff --git a/elpa/magithub-20161004.523/magithub-ci.el b/elpa/magithub-20161011.2129/magithub-ci.el
similarity index 59%
rename from elpa/magithub-20161004.523/magithub-ci.el
rename to elpa/magithub-20161011.2129/magithub-ci.el
index ade391c..4947e64 100644
--- a/elpa/magithub-20161004.523/magithub-ci.el
+++ b/elpa/magithub-20161011.2129/magithub-ci.el
@@ -27,10 +27,27 @@
 (require 'magit)
 (require 'magit-section)
 (require 'magit-popup)
+(require 'dash)
 
 (require 'magithub-core)
 (require 'magithub-cache)
 
+(defconst magithub-ci-status-symbol-alist
+  '(("✔" . success)
+    ("✖" . failure)                     ; also means `error'... gross
+    ("●" . pending))
+  "Because hub 2.3 is silly and does silly things.
+Reference: https://github.com/github/hub/blob/master/commands/ci_status.go#L107")
+
+(defconst magithub-ci-status-regex
+  (rx bos
+      (group any) (* any) "\t"
+      (group (* any)) "\t"
+      (? (group (* any))) eos))
+
+(defvar magithub-ci-urls nil
+  "An alist mapping of repositories to CI urls.")
+
 (defun magithub-ci-enabled-p ()
   "Non-nil if CI is enabled for this repository.
 If magithub.ci.enabled is not set, CI is considered to be enabled."
@@ -79,34 +96,75 @@ If magithub.ci.enabled is not set, CI is considered to be enabled."
     (if new-value (apply #'magit-set new-value keys)
       (apply #'magit-get keys))))
 
+(defun magithub-ci-update-urls (statuses)
+  "Updates `magithub-ci-urls' according to STATUSES.
+See also `magithub-repo-id'."
+  (let* ((id (magithub-repo-id))
+         (repo-urls (assoc id magithub-ci-urls))
+         (urls (mapcar (lambda (s) (plist-get s :url)) statuses)))
+    (if repo-urls (setcdr repo-urls urls)
+      (add-to-list 'magithub-ci-urls (cons id urls))
+      urls)))
+
+(defun magithub-ci-status--parse-2.2.8 (output)
+  "Backwards compatibility for old versions of hub.
+See `magithub-ci-status--parse'."
+  (--when-let (cdr (s-match (rx bos (group (+ (any alpha space)))
+                                (? ": " (group (+ (not (any " "))))) eos)
+                            output))
+    (let ((status (list :status (intern (replace-regexp-in-string "\s" "-" (car it)))
+                        :url (cadr it))))
+      (magithub-ci-update-urls (list status))
+      status)))
+
 (defun magithub-ci-status--internal (&optional for-commit)
   "One of 'success, 'error, 'failure, 'pending, or 'no-status."
-  (with-temp-message "Updating CI status..."
-    (let* ((current-commit (magit-rev-parse "HEAD"))
-           (last-commit (or for-commit current-commit))
-           (output (car (magithub--command-output "ci-status" `("-v" ,last-commit)))))
-      (if (string-match (rx bos (group (+ (any alpha space)))
-                            (? ": " (group (+ (not (any " "))))) eos)
-                        output)
-          (let (status url)
-            (setq status (intern (replace-regexp-in-string "\s" "-" (match-string 1 output)))
-                  url (match-string 2 output))
-            (when url (magit-set url "magithub" "ci" "url"))
-            (if (and (not for-commit) (eq status 'no-status))
-                (let ((last-commit (magithub-ci-status--last-commit)))
-                  (unless (string-equal current-commit last-commit)
-                    (magithub-ci-status--internal last-commit))
-                  (magithub-ci-status-current-commit current-commit)
-                  status)
-              (magithub-ci-status-current-commit current-commit)
-              status))
-        (beep)
-        (setq magithub-hub-error
-              (message
-               (concat "Hub didn't have any output for \"ci-status\"!\n"
-                       "Are you connected to the internet?\n"
-                       "Consider submitting an issue to github/hub.")))
-        'internal-error))))
+  (let* ((current-commit (magit-rev-parse "HEAD"))
+         (last-commit (or for-commit current-commit))
+         (output (magithub--command-output "ci-status" `("-v" ,last-commit))))
+    (--if-let (if (magithub-hub-version-at-least "2.3")
+                  (car (magithub-ci-status--parse output))
+                (magithub-ci-status--parse-2.2.8 (car output)))
+        (prog1 (or (plist-get it :status) 'no-status)
+          (if (not (or for-commit (plist-get it :status)))
+              (let ((last-commit (magithub-ci-status--last-commit)))
+                (unless (string-equal current-commit last-commit)
+                  (magithub-ci-status--internal last-commit))
+                (magithub-ci-status-current-commit current-commit))
+            (magithub-ci-status-current-commit current-commit)))
+      (beep)
+      (setq magithub-hub-error
+            (message
+             (concat "Hub didn't have any recognizable output for \"ci-status\"!\n"
+                     "Are you connected to the internet?\n"
+                     "Consider submitting an issue to github/hub.")))
+      'internal-error)))
+
+(defun magithub-ci-status--parse (output)
+  "Parse a string OUTPUT into a list of statuses.
+The first status will be an `overall' status."
+  (let ((statuses (mapcar #'magithub-ci-status--parse-line output))
+        (get-status (lambda (status) (lambda (s) (eq (plist-get s :status) status)))))
+    (magithub-ci-update-urls statuses)
+    (cons
+     (list :check 'overall
+           :status
+           (cond
+            ((-all? (funcall get-status 'success) statuses) 'success)
+            ((-some? (funcall get-status 'pending) statuses) 'pending)
+            ((-some? (funcall get-status 'error) statuses) 'error)
+            ((-some? (funcall get-status 'failure) statuses) 'failure)))
+     statuses)))
+
+(defun magithub-ci-status--parse-line (line)
+  "Parse a single LINE of status into a status plist."
+  (--if-let (cdr (s-match magithub-ci-status-regex line))
+      (list :status (cdr (assoc (car it) magithub-ci-status-symbol-alist))
+            :url (car (cddr it))
+            :check (cadr it))
+    (if (string= line "no-status")
+        'no-status
+      (if (string= line "") 'no-output))))
 
 (defun magithub-ci-status--last-commit ()
   "Find the commit considered to have the current CI status.
@@ -178,13 +236,12 @@ See the following resources:
   "Browse the CI.
 Sets up magithub.ci.url if necessary."
   (interactive)
-  (let ((var-value (magit-get "magithub" "ci" "url")))
-    (unless var-value
-      (magit-set
-       (setq var-value (read-from-minibuffer "I don't know the CI URL yet -- what is it?  I'll remember: ")
-             var-value (if (string-equal "" var-value) nil var-value))
-       "magithub" "ci" "url"))
-    (browse-url var-value)))
+  (let* ((urls (cdr (assoc (magithub-repo-id) magithub-ci-urls)))
+         (target-url (if (= 1 (length urls)) (car urls)
+                       (when urls (completing-read "CI Dashboard URL: " urls)))))
+    (when (or (null target-url) (string= "" target-url))
+      (user-error "No CI URL detected"))
+    (browse-url target-url)))
 
 (defvar magit-magithub-ci-status-section-map
   (let ((map (make-sparse-keymap)))
@@ -215,17 +272,11 @@ Sets up magithub.ci.url if necessary."
                'face (if (facep face) face 'magithub-ci-unknown)))
       (insert ?\n))))
 
-(defun magithub-toggle-ci-status-header ()
-  (interactive)
-  (if (memq #'magithub-maybe-insert-ci-status-header magit-status-headers-hook)
-      (remove-hook 'magit-status-headers-hook #'magithub-maybe-insert-ci-status-header)
-    (if (executable-find magithub-hub-executable)
-        (add-hook 'magit-status-headers-hook #'magithub-maybe-insert-ci-status-header t)
-      (message "Magithub: (magithub-toggle-ci-status-header) `hub' isn't installed, so I can't insert the CI header")))
-  (when (derived-mode-p 'magit-status-mode)
-    (magit-refresh)))
+(magithub--deftoggle magithub-toggle-ci-status-header
+  magit-status-headers-hook #'magithub-maybe-insert-ci-status-header "the CI header")
 
-(magithub-toggle-ci-status-header)
+(when (executable-find magithub-hub-executable)
+  (magithub-toggle-ci-status-header))
 
 (provide 'magithub-ci)
 ;;; magithub-ci.el ends here
diff --git a/elpa/magithub-20161004.523/magithub-core.el b/elpa/magithub-20161011.2129/magithub-core.el
similarity index 84%
rename from elpa/magithub-20161004.523/magithub-core.el
rename to elpa/magithub-20161011.2129/magithub-core.el
index 52e7ca6..1b13e9e 100644
--- a/elpa/magithub-20161004.523/magithub-core.el
+++ b/elpa/magithub-20161011.2129/magithub-core.el
@@ -25,13 +25,13 @@
 ;;; Code:
 
 (require 'magit)
+(require 'dash)
 
 (defun magithub-github-repository-p ()
   "Non-nil if \"origin\" points to GitHub or a whitelisted domain."
-  (let ((url (magit-get "remote" "origin" "url")))
-    (when url
-      (cl-some (lambda (domain) (s-contains? domain url))
-               (cons "github.com" (magit-get-all "hub" "host"))))))
+  (--when-let (magit-get "remote" "origin" "url")
+    (-some? (lambda (domain) (s-contains? domain it))
+            (cons "github.com" (magit-get-all "hub" "host")))))
 
 (defun magithub-repo-id ()
   "Returns an identifying value for this repository."
@@ -111,6 +111,17 @@ and returns its output as a list of lines."
   "Quickly execute COMMAND with ARGS."
   (ignore (magithub--command-output command args)))
 
+(defun magithub-hub-version ()
+  "Return the `hub' version as a string."
+  (-> "--version"
+      magithub--command-output cadr
+      split-string cddr car
+      (split-string "-") car))
+
+(defun magithub-hub-version-at-least (version-string)
+  "Return t if `hub's version is at least VERSION-STRING."
+  (version<= version-string (magithub-hub-version)))
+
 (defun magithub--meta-new-issue ()
   "Open a new Magithub issue.
 See /.github/ISSUE_TEMPLATE.md in this repository."
@@ -118,7 +129,7 @@ See /.github/ISSUE_TEMPLATE.md in this repository."
   (browse-url "https://github.com/vermiculus/magithub/issues/new"))
 
 (defun magithub--meta-help ()
-  "Opens Magithub help."
+  "Open Magithub help."
   (interactive)
   (browse-url "https://gitter.im/vermiculus/magithub"))
 
@@ -180,5 +191,20 @@ See /.github/ISSUE_TEMPLATE.md in this repository."
     (magithub--meta-new-issue))
   (error err-message))
 
+(defmacro magithub--deftoggle (name hook func s)
+  "Define a section-toggle command."
+  (declare (indent defun))
+  `(defun ,name ()
+     ,(concat "Toggle the " s " section.")
+     (interactive)
+     (if (memq ,func ,hook)
+         (remove-hook ',hook ,func)
+       (if (executable-find magithub-hub-executable)
+           (add-hook ',hook ,func t)
+         (message ,(concat "`hub' isn't installed, so I can't insert " s))))
+     (when (derived-mode-p 'magit-status-mode)
+       (magit-refresh))
+     (memq ,func ,hook)))
+
 (provide 'magithub-core)
 ;;; magithub-core.el ends here
diff --git a/elpa/magithub-20161004.523/magithub-issue.el b/elpa/magithub-20161011.2129/magithub-issue.el
similarity index 67%
rename from elpa/magithub-20161004.523/magithub-issue.el
rename to elpa/magithub-20161011.2129/magithub-issue.el
index fca6f82..d68f668 100644
--- a/elpa/magithub-20161004.523/magithub-issue.el
+++ b/elpa/magithub-20161011.2129/magithub-issue.el
@@ -26,6 +26,7 @@
 
 (require 'magit)
 (require 'magit-section)
+(require 'dash)
 
 (require 'magithub-core)
 (require 'magithub-cache)
@@ -71,7 +72,19 @@ are in DEFAULT are not prompted for again."
     (let* ((default-labels (when default (s-split "," default t))))
       (cl-set-difference (magithub-issue-label-list) default-labels)))))
 
-(defun magithub-issue--process-line (s)
+(defun magithub-issue--sort (issues)
+  "Sort ISSUES by issue number."
+  (sort issues
+        (lambda (a b) (< (plist-get a :number)
+                         (plist-get b :number)))))
+
+(defun magithub-issue--url-type (url)
+  "If URL corresponds to an issue, the symbol `issue'.
+If URL correponds to a pull request, the symbol `pull-request'."
+  (if (string-match-p (rx "/pull/" (+ digit) eos) url)
+      'pull-request 'issue))
+
+(defun magithub-issue--process-line-2.2.8 (s)
   "Process a line S into an issue.
 
 Returns a plist with the following properties:
@@ -98,25 +111,49 @@ Returns a plist with the following properties:
             (setq url (buffer-substring-no-properties (point) (point-max)))
             t))
         (list :number number
-              :type (if (string-match-p (rx "/pull/" (+ digit) eos) url)
-                        'pull-request 'issue)
+              :type (magithub-issue--url-type url)
               :title title
               :url url)
       (magithub-error
        "failed to parse issue"
        "There was an error parsing issues."))))
 
+(defun magithub-issue-list--internal-2.2.8 ()
+  "Backwards compatibility for old versions of hub.
+See `magithub-issue-list--internal'."
+  (magithub-issue--sort
+   (mapcar #'magithub-issue--process-line-2.2.8
+           (magithub--command-output "issue"))))
+
+(defun magithub-issue--process-line (s)
+  "Process a line S into an issue.
+
+Returns a plist with the following properties:
+
+  :number  issue or pull request number
+  :type    either 'pull-request or 'issue
+  :title   the title of the issue or pull request
+  :url     link to issue or pull request"
+  (let ((ss (split-string s ",")))
+    (list
+     :number (string-to-number (car ss))
+     :url (cadr ss)
+     :title (s-join "," (cddr ss))
+     :type (magithub-issue--url-type (cadr ss)))))
+
+(defun magithub-issue-list--internal ()
+  "Return a new list of issues for the current repository."
+  (magithub-issue--sort
+   (mapcar #'magithub-issue--process-line
+           (magithub--command-output "issue" '("--format=%I,%U,%t%n")))))
+
 (defun magithub-issue-list ()
   "Return a list of issues for the current repository."
   (magithub-cache (magithub-repo-id) :issues
     '(with-temp-message "Retrieving issue list..."
-       (magithub-issue-list--internal))))
-
-(defun magithub-issue-list--internal ()
-  (sort (mapcar #'magithub-issue--process-line
-                (magithub--command-output "issue"))
-        (lambda (a b) (< (plist-get a :number)
-                         (plist-get b :number)))))
+       (if (magithub-hub-version-at-least "2.3")
+           (magithub-issue-list--internal)
+         (magithub-issue-list--internal-2.2.8)))))
 
 (defun magithub-issue--insert (issue)
   "Insert an `issue' as a Magit section into the buffer."
@@ -129,11 +166,7 @@ Returns a plist with the following properties:
           (let ((key (car formats)) (fmt (cadr formats)))
             (setq s (concat s (format fmt (plist-get issue key)))))
           (setq formats (cddr formats)))
-        (insert
-         (propertize
-          s 'face
-          (when (eq (plist-get issue :type) 'pull-request)
-            'magit-branch-remote))))
+        (insert s))
       (insert ?\n))))
 
 (defun magithub-issue-browse (issue)
@@ -168,28 +201,42 @@ If `issue' is nil, open the repository's issues page."
     map)
   "Keymap for `magithub-issue-list' sections.")
 
-(defun magithub-issue--insert-section ()
+(defvar magit-magithub-pull-request-list-section-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [remap magit-visit-thing] #'magithub-issue-browse)
+    (define-key map [remap magit-refresh] #'magithub-issue-refresh)
+    map)
+  "Keymap for `magithub-pull-request-list' sections.")
+
+(defun magithub-issue--insert-issue-section ()
   "Insert GitHub issues if appropriate."
   (when (magithub-usable-p)
-    (let* ((issues (magithub-issue-list)))
+    (--when-let (-filter (lambda (i) (eq (plist-get i :type) 'issue))
+                         (magithub-issue-list))
       (magit-insert-section (magithub-issue-list)
-        (magit-insert-heading "Issues and Pull Requests:")
-        (if issues (mapc #'magithub-issue--insert issues)
-          (insert "  No issues.\n"))))))
+        (magit-insert-heading "Issues:")
+        (mapc #'magithub-issue--insert it)
+        (insert ?\n)))))
+
+(defun magithub-issue--insert-pr-section ()
+  "Insert GitHub pull requests if appropriate."
+  (when (magithub-usable-p)
+    (--when-let (-filter (lambda (i) (eq (plist-get i :type) 'pull-request))
+                         (magithub-issue-list))
+      (magit-insert-section (magithub-pull-request-list)
+        (magit-insert-heading "Pull Requests:")
+        (mapc #'magithub-issue--insert it)
+        (insert ?\n)))))
 
 ;;; Hook into the status buffer
-(defun magithub-toggle-issues ()
-  (interactive)
-  (if (memq #'magithub-issue--insert-section magit-status-sections-hook)
-      (remove-hook 'magit-status-sections-hook #'magithub-issue--insert-section)
-    (if (executable-find magithub-hub-executable)
-        (add-hook ' magit-status-sections-hook #'magithub-issue--insert-section t)
-      (message "Magithub: (magithub-toggle-issues) `hub' isn't installed, so I can't insert issues")))
-  (when (derived-mode-p 'magit-status-mode)
-    (magit-refresh))
-  (memq #'magithub-issue--insert-section magit-status-sections-hook))
+(magithub--deftoggle magithub-toggle-issues
+  magit-status-sections-hook #'magithub-issue--insert-issue-section "issues")
+(magithub--deftoggle magithub-toggle-pull-requests
+  magit-status-sections-hook #'magithub-issue--insert-pr-section "pull requests")
 
-(magithub-toggle-issues)
+(when (executable-find magithub-hub-executable)
+  (magithub-toggle-pull-requests)
+  (magithub-toggle-issues))
 
 (provide 'magithub-issue)
 ;;; magithub-issue.el ends here
diff --git a/elpa/magithub-20161004.523/magithub-pkg.el b/elpa/magithub-20161011.2129/magithub-pkg.el
similarity index 74%
rename from elpa/magithub-20161004.523/magithub-pkg.el
rename to elpa/magithub-20161011.2129/magithub-pkg.el
index f04d9f0..5cfe5d8 100644
--- a/elpa/magithub-20161004.523/magithub-pkg.el
+++ b/elpa/magithub-20161011.2129/magithub-pkg.el
@@ -1,5 +1,5 @@
-(define-package "magithub" "20161004.523" "Magit interfaces for GitHub"
-  '((emacs "24.3")
+(define-package "magithub" "20161011.2129" "Magit interfaces for GitHub"
+  '((emacs "24.4")
     (magit "2.8.0")
     (git-commit "20160821.1338")
     (with-editor "20160828.1025")
diff --git a/elpa/magithub-20161004.523/magithub.el b/elpa/magithub-20161011.2129/magithub.el
similarity index 97%
rename from elpa/magithub-20161004.523/magithub.el
rename to elpa/magithub-20161011.2129/magithub.el
index 54b5dd2..7639e54 100644
--- a/elpa/magithub-20161004.523/magithub.el
+++ b/elpa/magithub-20161011.2129/magithub.el
@@ -5,7 +5,7 @@
 ;; Author: Sean Allred <code@seanallred.com>
 ;; Keywords: git, tools, vc
 ;; Homepage: https://github.com/vermiculus/magithub
-;; Package-Requires: ((emacs "24.3") (magit "2.8.0") (git-commit "20160821.1338") (with-editor "20160828.1025") (cl-lib "1.0") (s "20160711.525"))
+;; Package-Requires: ((emacs "24.4") (magit "2.8.0") (git-commit "20160821.1338") (with-editor "20160828.1025") (cl-lib "1.0") (s "20160711.525"))
 ;; Package-Version: 0.1
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -48,6 +48,7 @@
 (require 'with-editor)
 (require 'cl-lib)
 (require 's)
+(require 'dash)
 
 (require 'magithub-core)
 (require 'magithub-issue)
@@ -197,11 +198,10 @@ This function will return nil for matches to
 
 (defun magithub-check-buffer ()
   "If this is a buffer created by hub, perform setup."
-  (let ((type (magithub--edit-file-type buffer-file-name)))
-    (when type
-      (magithub-setup-edit-buffer)
-      (when (eq type 'issue)
-        (magithub-setup-new-issue-buffer)))))
+  (--when-let (magithub--edit-file-type buffer-file-name)
+    (magithub-setup-edit-buffer)
+    (when (eq it 'issue)
+      (magithub-setup-new-issue-buffer))))
 (add-hook 'find-file-hook #'magithub-check-buffer)
 
 (defun magithub-clone--get-repo ()
diff --git a/elpa/org-20161003/org-pkg.el b/elpa/org-20161003/org-pkg.el
deleted file mode 100644
index 378f7ba..0000000
--- a/elpa/org-20161003/org-pkg.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(define-package "org"
-  "20161003" "Outline-based notes management and organizer" ( ))
-;; no-byte-compile: t
diff --git a/elpa/org-20161003/COPYING b/elpa/org-20161010/COPYING
similarity index 100%
rename from elpa/org-20161003/COPYING
rename to elpa/org-20161010/COPYING
diff --git a/elpa/org-20161003/README_ELPA b/elpa/org-20161010/README_ELPA
similarity index 100%
rename from elpa/org-20161003/README_ELPA
rename to elpa/org-20161010/README_ELPA
diff --git a/elpa/org-20161003/dir b/elpa/org-20161010/dir
similarity index 100%
rename from elpa/org-20161003/dir
rename to elpa/org-20161010/dir
diff --git a/elpa/org-20161003/etc/ORG-NEWS b/elpa/org-20161010/etc/ORG-NEWS
similarity index 100%
rename from elpa/org-20161003/etc/ORG-NEWS
rename to elpa/org-20161010/etc/ORG-NEWS
diff --git a/elpa/org-20161003/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-20161010/etc/styles/OrgOdtContentTemplate.xml
similarity index 100%
rename from elpa/org-20161003/etc/styles/OrgOdtContentTemplate.xml
rename to elpa/org-20161010/etc/styles/OrgOdtContentTemplate.xml
diff --git a/elpa/org-20161003/etc/styles/OrgOdtStyles.xml b/elpa/org-20161010/etc/styles/OrgOdtStyles.xml
similarity index 100%
rename from elpa/org-20161003/etc/styles/OrgOdtStyles.xml
rename to elpa/org-20161010/etc/styles/OrgOdtStyles.xml
diff --git a/elpa/org-20161003/etc/styles/README b/elpa/org-20161010/etc/styles/README
similarity index 100%
rename from elpa/org-20161003/etc/styles/README
rename to elpa/org-20161010/etc/styles/README
diff --git a/elpa/org-20161003/ob-C.el b/elpa/org-20161010/ob-C.el
similarity index 100%
rename from elpa/org-20161003/ob-C.el
rename to elpa/org-20161010/ob-C.el
diff --git a/elpa/org-20161003/ob-J.el b/elpa/org-20161010/ob-J.el
similarity index 100%
rename from elpa/org-20161003/ob-J.el
rename to elpa/org-20161010/ob-J.el
diff --git a/elpa/org-20161003/ob-R.el b/elpa/org-20161010/ob-R.el
similarity index 100%
rename from elpa/org-20161003/ob-R.el
rename to elpa/org-20161010/ob-R.el
diff --git a/elpa/org-20161003/ob-abc.el b/elpa/org-20161010/ob-abc.el
similarity index 100%
rename from elpa/org-20161003/ob-abc.el
rename to elpa/org-20161010/ob-abc.el
diff --git a/elpa/org-20161003/ob-asymptote.el b/elpa/org-20161010/ob-asymptote.el
similarity index 100%
rename from elpa/org-20161003/ob-asymptote.el
rename to elpa/org-20161010/ob-asymptote.el
diff --git a/elpa/org-20161003/ob-awk.el b/elpa/org-20161010/ob-awk.el
similarity index 100%
rename from elpa/org-20161003/ob-awk.el
rename to elpa/org-20161010/ob-awk.el
diff --git a/elpa/org-20161003/ob-calc.el b/elpa/org-20161010/ob-calc.el
similarity index 100%
rename from elpa/org-20161003/ob-calc.el
rename to elpa/org-20161010/ob-calc.el
diff --git a/elpa/org-20161003/ob-clojure.el b/elpa/org-20161010/ob-clojure.el
similarity index 100%
rename from elpa/org-20161003/ob-clojure.el
rename to elpa/org-20161010/ob-clojure.el
diff --git a/elpa/org-20161003/ob-comint.el b/elpa/org-20161010/ob-comint.el
similarity index 100%
rename from elpa/org-20161003/ob-comint.el
rename to elpa/org-20161010/ob-comint.el
diff --git a/elpa/org-20161003/ob-coq.el b/elpa/org-20161010/ob-coq.el
similarity index 100%
rename from elpa/org-20161003/ob-coq.el
rename to elpa/org-20161010/ob-coq.el
diff --git a/elpa/org-20161003/ob-core.el b/elpa/org-20161010/ob-core.el
similarity index 100%
rename from elpa/org-20161003/ob-core.el
rename to elpa/org-20161010/ob-core.el
diff --git a/elpa/org-20161003/ob-css.el b/elpa/org-20161010/ob-css.el
similarity index 100%
rename from elpa/org-20161003/ob-css.el
rename to elpa/org-20161010/ob-css.el
diff --git a/elpa/org-20161003/ob-ditaa.el b/elpa/org-20161010/ob-ditaa.el
similarity index 100%
rename from elpa/org-20161003/ob-ditaa.el
rename to elpa/org-20161010/ob-ditaa.el
diff --git a/elpa/org-20161003/ob-dot.el b/elpa/org-20161010/ob-dot.el
similarity index 100%
rename from elpa/org-20161003/ob-dot.el
rename to elpa/org-20161010/ob-dot.el
diff --git a/elpa/org-20161003/ob-ebnf.el b/elpa/org-20161010/ob-ebnf.el
similarity index 100%
rename from elpa/org-20161003/ob-ebnf.el
rename to elpa/org-20161010/ob-ebnf.el
diff --git a/elpa/org-20161003/ob-emacs-lisp.el b/elpa/org-20161010/ob-emacs-lisp.el
similarity index 100%
rename from elpa/org-20161003/ob-emacs-lisp.el
rename to elpa/org-20161010/ob-emacs-lisp.el
diff --git a/elpa/org-20161003/ob-eval.el b/elpa/org-20161010/ob-eval.el
similarity index 100%
rename from elpa/org-20161003/ob-eval.el
rename to elpa/org-20161010/ob-eval.el
diff --git a/elpa/org-20161003/ob-exp.el b/elpa/org-20161010/ob-exp.el
similarity index 100%
rename from elpa/org-20161003/ob-exp.el
rename to elpa/org-20161010/ob-exp.el
diff --git a/elpa/org-20161003/ob-forth.el b/elpa/org-20161010/ob-forth.el
similarity index 100%
rename from elpa/org-20161003/ob-forth.el
rename to elpa/org-20161010/ob-forth.el
diff --git a/elpa/org-20161003/ob-fortran.el b/elpa/org-20161010/ob-fortran.el
similarity index 100%
rename from elpa/org-20161003/ob-fortran.el
rename to elpa/org-20161010/ob-fortran.el
diff --git a/elpa/org-20161003/ob-gnuplot.el b/elpa/org-20161010/ob-gnuplot.el
similarity index 100%
rename from elpa/org-20161003/ob-gnuplot.el
rename to elpa/org-20161010/ob-gnuplot.el
diff --git a/elpa/org-20161003/ob-groovy.el b/elpa/org-20161010/ob-groovy.el
similarity index 100%
rename from elpa/org-20161003/ob-groovy.el
rename to elpa/org-20161010/ob-groovy.el
diff --git a/elpa/org-20161003/ob-haskell.el b/elpa/org-20161010/ob-haskell.el
similarity index 100%
rename from elpa/org-20161003/ob-haskell.el
rename to elpa/org-20161010/ob-haskell.el
diff --git a/elpa/org-20161003/ob-io.el b/elpa/org-20161010/ob-io.el
similarity index 100%
rename from elpa/org-20161003/ob-io.el
rename to elpa/org-20161010/ob-io.el
diff --git a/elpa/org-20161003/ob-java.el b/elpa/org-20161010/ob-java.el
similarity index 100%
rename from elpa/org-20161003/ob-java.el
rename to elpa/org-20161010/ob-java.el
diff --git a/elpa/org-20161003/ob-js.el b/elpa/org-20161010/ob-js.el
similarity index 100%
rename from elpa/org-20161003/ob-js.el
rename to elpa/org-20161010/ob-js.el
diff --git a/elpa/org-20161003/ob-keys.el b/elpa/org-20161010/ob-keys.el
similarity index 100%
rename from elpa/org-20161003/ob-keys.el
rename to elpa/org-20161010/ob-keys.el
diff --git a/elpa/org-20161003/ob-latex.el b/elpa/org-20161010/ob-latex.el
similarity index 100%
rename from elpa/org-20161003/ob-latex.el
rename to elpa/org-20161010/ob-latex.el
diff --git a/elpa/org-20161003/ob-ledger.el b/elpa/org-20161010/ob-ledger.el
similarity index 100%
rename from elpa/org-20161003/ob-ledger.el
rename to elpa/org-20161010/ob-ledger.el
diff --git a/elpa/org-20161003/ob-lilypond.el b/elpa/org-20161010/ob-lilypond.el
similarity index 100%
rename from elpa/org-20161003/ob-lilypond.el
rename to elpa/org-20161010/ob-lilypond.el
diff --git a/elpa/org-20161003/ob-lisp.el b/elpa/org-20161010/ob-lisp.el
similarity index 100%
rename from elpa/org-20161003/ob-lisp.el
rename to elpa/org-20161010/ob-lisp.el
diff --git a/elpa/org-20161003/ob-lob.el b/elpa/org-20161010/ob-lob.el
similarity index 100%
rename from elpa/org-20161003/ob-lob.el
rename to elpa/org-20161010/ob-lob.el
diff --git a/elpa/org-20161003/ob-makefile.el b/elpa/org-20161010/ob-makefile.el
similarity index 100%
rename from elpa/org-20161003/ob-makefile.el
rename to elpa/org-20161010/ob-makefile.el
diff --git a/elpa/org-20161003/ob-matlab.el b/elpa/org-20161010/ob-matlab.el
similarity index 100%
rename from elpa/org-20161003/ob-matlab.el
rename to elpa/org-20161010/ob-matlab.el
diff --git a/elpa/org-20161003/ob-maxima.el b/elpa/org-20161010/ob-maxima.el
similarity index 100%
rename from elpa/org-20161003/ob-maxima.el
rename to elpa/org-20161010/ob-maxima.el
diff --git a/elpa/org-20161003/ob-mscgen.el b/elpa/org-20161010/ob-mscgen.el
similarity index 100%
rename from elpa/org-20161003/ob-mscgen.el
rename to elpa/org-20161010/ob-mscgen.el
diff --git a/elpa/org-20161003/ob-ocaml.el b/elpa/org-20161010/ob-ocaml.el
similarity index 100%
rename from elpa/org-20161003/ob-ocaml.el
rename to elpa/org-20161010/ob-ocaml.el
diff --git a/elpa/org-20161003/ob-octave.el b/elpa/org-20161010/ob-octave.el
similarity index 100%
rename from elpa/org-20161003/ob-octave.el
rename to elpa/org-20161010/ob-octave.el
diff --git a/elpa/org-20161003/ob-org.el b/elpa/org-20161010/ob-org.el
similarity index 100%
rename from elpa/org-20161003/ob-org.el
rename to elpa/org-20161010/ob-org.el
diff --git a/elpa/org-20161003/ob-perl.el b/elpa/org-20161010/ob-perl.el
similarity index 100%
rename from elpa/org-20161003/ob-perl.el
rename to elpa/org-20161010/ob-perl.el
diff --git a/elpa/org-20161003/ob-picolisp.el b/elpa/org-20161010/ob-picolisp.el
similarity index 100%
rename from elpa/org-20161003/ob-picolisp.el
rename to elpa/org-20161010/ob-picolisp.el
diff --git a/elpa/org-20161003/ob-plantuml.el b/elpa/org-20161010/ob-plantuml.el
similarity index 100%
rename from elpa/org-20161003/ob-plantuml.el
rename to elpa/org-20161010/ob-plantuml.el
diff --git a/elpa/org-20161003/ob-processing.el b/elpa/org-20161010/ob-processing.el
similarity index 100%
rename from elpa/org-20161003/ob-processing.el
rename to elpa/org-20161010/ob-processing.el
diff --git a/elpa/org-20161003/ob-python.el b/elpa/org-20161010/ob-python.el
similarity index 100%
rename from elpa/org-20161003/ob-python.el
rename to elpa/org-20161010/ob-python.el
diff --git a/elpa/org-20161003/ob-ref.el b/elpa/org-20161010/ob-ref.el
similarity index 100%
rename from elpa/org-20161003/ob-ref.el
rename to elpa/org-20161010/ob-ref.el
diff --git a/elpa/org-20161003/ob-ruby.el b/elpa/org-20161010/ob-ruby.el
similarity index 100%
rename from elpa/org-20161003/ob-ruby.el
rename to elpa/org-20161010/ob-ruby.el
diff --git a/elpa/org-20161003/ob-sass.el b/elpa/org-20161010/ob-sass.el
similarity index 100%
rename from elpa/org-20161003/ob-sass.el
rename to elpa/org-20161010/ob-sass.el
diff --git a/elpa/org-20161003/ob-scala.el b/elpa/org-20161010/ob-scala.el
similarity index 100%
rename from elpa/org-20161003/ob-scala.el
rename to elpa/org-20161010/ob-scala.el
diff --git a/elpa/org-20161003/ob-scheme.el b/elpa/org-20161010/ob-scheme.el
similarity index 100%
rename from elpa/org-20161003/ob-scheme.el
rename to elpa/org-20161010/ob-scheme.el
diff --git a/elpa/org-20161003/ob-screen.el b/elpa/org-20161010/ob-screen.el
similarity index 100%
rename from elpa/org-20161003/ob-screen.el
rename to elpa/org-20161010/ob-screen.el
diff --git a/elpa/org-20161003/ob-sed.el b/elpa/org-20161010/ob-sed.el
similarity index 100%
rename from elpa/org-20161003/ob-sed.el
rename to elpa/org-20161010/ob-sed.el
diff --git a/elpa/org-20161003/ob-shell.el b/elpa/org-20161010/ob-shell.el
similarity index 100%
rename from elpa/org-20161003/ob-shell.el
rename to elpa/org-20161010/ob-shell.el
diff --git a/elpa/org-20161003/ob-shen.el b/elpa/org-20161010/ob-shen.el
similarity index 100%
rename from elpa/org-20161003/ob-shen.el
rename to elpa/org-20161010/ob-shen.el
diff --git a/elpa/org-20161003/ob-sql.el b/elpa/org-20161010/ob-sql.el
similarity index 100%
rename from elpa/org-20161003/ob-sql.el
rename to elpa/org-20161010/ob-sql.el
diff --git a/elpa/org-20161003/ob-sqlite.el b/elpa/org-20161010/ob-sqlite.el
similarity index 100%
rename from elpa/org-20161003/ob-sqlite.el
rename to elpa/org-20161010/ob-sqlite.el
diff --git a/elpa/org-20161003/ob-stan.el b/elpa/org-20161010/ob-stan.el
similarity index 100%
rename from elpa/org-20161003/ob-stan.el
rename to elpa/org-20161010/ob-stan.el
diff --git a/elpa/org-20161003/ob-table.el b/elpa/org-20161010/ob-table.el
similarity index 100%
rename from elpa/org-20161003/ob-table.el
rename to elpa/org-20161010/ob-table.el
diff --git a/elpa/org-20161003/ob-tangle.el b/elpa/org-20161010/ob-tangle.el
similarity index 100%
rename from elpa/org-20161003/ob-tangle.el
rename to elpa/org-20161010/ob-tangle.el
diff --git a/elpa/org-20161003/ob.el b/elpa/org-20161010/ob.el
similarity index 100%
rename from elpa/org-20161003/ob.el
rename to elpa/org-20161010/ob.el
diff --git a/elpa/org-20161003/org b/elpa/org-20161010/org
similarity index 99%
rename from elpa/org-20161003/org
rename to elpa/org-20161010/org
index 8c928c9..ad48531 100644
--- a/elpa/org-20161003/org
+++ b/elpa/org-20161010/org
@@ -1,6 +1,6 @@
 This is org, produced by makeinfo version 4.13 from org.texi.
 
-This manual is for Org version 8.3.6 (release_8.3.6-6-g194e51).
+This manual is for Org version 8.3.6 (release_8.3.6-7-g4d7d52).
 
    Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
@@ -26,7 +26,7 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org version 8.3.6 (release_8.3.6-6-g194e51).
+This manual is for Org version 8.3.6 (release_8.3.6-7-g4d7d52).
 
    Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
diff --git a/elpa/org-20161003/org-agenda.el b/elpa/org-20161010/org-agenda.el
similarity index 99%
rename from elpa/org-20161003/org-agenda.el
rename to elpa/org-20161010/org-agenda.el
index 0f7d8fe..47f2127 100644
--- a/elpa/org-20161003/org-agenda.el
+++ b/elpa/org-20161010/org-agenda.el
@@ -1052,9 +1052,9 @@ current item's tree, in an indirect buffer."
 (defcustom org-agenda-entry-text-maxlines 5
   "Number of text lines to be added when `E' is pressed in the agenda.
 
-Note that this variable only used during agenda display.  Add add entry text
+Note that this variable only used during agenda display.  To add entry text
 when exporting the agenda, configure the variable
-`org-agenda-add-entry-ext-maxlines'."
+`org-agenda-add-entry-text-maxlines'."
   :group 'org-agenda
   :type 'integer)
 
diff --git a/elpa/org-20161003/org-archive.el b/elpa/org-20161010/org-archive.el
similarity index 100%
rename from elpa/org-20161003/org-archive.el
rename to elpa/org-20161010/org-archive.el
diff --git a/elpa/org-20161003/org-attach.el b/elpa/org-20161010/org-attach.el
similarity index 100%
rename from elpa/org-20161003/org-attach.el
rename to elpa/org-20161010/org-attach.el
diff --git a/elpa/org-20161003/org-autoloads.el b/elpa/org-20161010/org-autoloads.el
similarity index 97%
rename from elpa/org-20161003/org-autoloads.el
rename to elpa/org-20161010/org-autoloads.el
index bcbe0a9..6b31d45 100644
--- a/elpa/org-20161003/org-autoloads.el
+++ b/elpa/org-20161010/org-autoloads.el
@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "org" "org.el" (22514 17656 944687 252000))
+;;;### (autoloads nil "org" "org.el" (22525 59318 244390 595000))
 ;;; Generated autoloads from org.el
 
 (autoload 'org-babel-do-load-languages "org" "\
@@ -224,8 +224,8 @@ Call the customize function with org as argument.
 
 ;;;***
 
-;;;### (autoloads nil "org-agenda" "org-agenda.el" (22514 17656 668686
-;;;;;;  619000))
+;;;### (autoloads nil "org-agenda" "org-agenda.el" (22525 59317 968388
+;;;;;;  625000))
 ;;; Generated autoloads from org-agenda.el
 
 (autoload 'org-toggle-sticky-agenda "org-agenda" "\
@@ -498,8 +498,8 @@ to override `appt-message-warning-time'.
 
 ;;;***
 
-;;;### (autoloads nil "org-capture" "org-capture.el" (22514 17656
-;;;;;;  852687 40000))
+;;;### (autoloads nil "org-capture" "org-capture.el" (22525 59318
+;;;;;;  152389 938000))
 ;;; Generated autoloads from org-capture.el
 
 (autoload 'org-capture-string "org-capture" "\
@@ -541,8 +541,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'.
 
 ;;;***
 
-;;;### (autoloads nil "org-colview" "org-colview.el" (22514 17656
-;;;;;;  576686 409000))
+;;;### (autoloads nil "org-colview" "org-colview.el" (22525 59317
+;;;;;;  884388 24000))
 ;;; Generated autoloads from org-colview.el
 
 (autoload 'org-columns-remove-overlays "org-colview" "\
@@ -605,8 +605,8 @@ Turn on or update column view in the agenda.
 
 ;;;***
 
-;;;### (autoloads nil "org-compat" "org-compat.el" (22514 17656 420686
-;;;;;;  51000))
+;;;### (autoloads nil "org-compat" "org-compat.el" (22525 59317 744387
+;;;;;;  25000))
 ;;; Generated autoloads from org-compat.el
 
 (autoload 'org-check-version "org-compat" "\
@@ -616,8 +616,8 @@ Try very hard to provide sensible version strings.
 
 ;;;***
 
-;;;### (autoloads nil "org-lint" "org-lint.el" (22514 17656 676686
-;;;;;;  637000))
+;;;### (autoloads nil "org-lint" "org-lint.el" (22525 59317 976388
+;;;;;;  683000))
 ;;; Generated autoloads from org-lint.el
 
 (autoload 'org-lint "org-lint" "\
@@ -633,8 +633,8 @@ ARG can also be a list of checker names, as symbols, to run.
 
 ;;;***
 
-;;;### (autoloads nil "org-macs" "org-macs.el" (22514 17656 724686
-;;;;;;  747000))
+;;;### (autoloads nil "org-macs" "org-macs.el" (22525 59318 24389
+;;;;;;  25000))
 ;;; Generated autoloads from org-macs.el
 
 (autoload 'org-load-noerror-mustsuffix "org-macs" "\
@@ -644,8 +644,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX.  Drop the MUSTSUFFIX a
 
 ;;;***
 
-;;;### (autoloads nil "org-version" "org-version.el" (22514 17656
-;;;;;;  880687 104000))
+;;;### (autoloads nil "org-version" "org-version.el" (22525 59318
+;;;;;;  180390 138000))
 ;;; Generated autoloads from org-version.el
 
 (autoload 'org-release "org-version" "\
@@ -690,8 +690,8 @@ The location of ODT styles.")
 ;;;;;;  "org-rmail.el" "org-src.el" "org-table.el" "org-timer.el"
 ;;;;;;  "org-w3m.el" "ox-ascii.el" "ox-beamer.el" "ox-html.el" "ox-icalendar.el"
 ;;;;;;  "ox-latex.el" "ox-man.el" "ox-md.el" "ox-odt.el" "ox-org.el"
-;;;;;;  "ox-publish.el" "ox-texinfo.el" "ox.el") (22514 17657 112687
-;;;;;;  636000))
+;;;;;;  "ox-publish.el" "ox-texinfo.el" "ox.el") (22525 59318 400391
+;;;;;;  709000))
 
 ;;;***
 
diff --git a/elpa/org-20161003/org-bbdb.el b/elpa/org-20161010/org-bbdb.el
similarity index 100%
rename from elpa/org-20161003/org-bbdb.el
rename to elpa/org-20161010/org-bbdb.el
diff --git a/elpa/org-20161003/org-bibtex.el b/elpa/org-20161010/org-bibtex.el
similarity index 100%
rename from elpa/org-20161003/org-bibtex.el
rename to elpa/org-20161010/org-bibtex.el
diff --git a/elpa/org-20161003/org-capture.el b/elpa/org-20161010/org-capture.el
similarity index 100%
rename from elpa/org-20161003/org-capture.el
rename to elpa/org-20161010/org-capture.el
diff --git a/elpa/org-20161003/org-clock.el b/elpa/org-20161010/org-clock.el
similarity index 100%
rename from elpa/org-20161003/org-clock.el
rename to elpa/org-20161010/org-clock.el
diff --git a/elpa/org-20161003/org-colview.el b/elpa/org-20161010/org-colview.el
similarity index 100%
rename from elpa/org-20161003/org-colview.el
rename to elpa/org-20161010/org-colview.el
diff --git a/elpa/org-20161003/org-compat.el b/elpa/org-20161010/org-compat.el
similarity index 100%
rename from elpa/org-20161003/org-compat.el
rename to elpa/org-20161010/org-compat.el
diff --git a/elpa/org-20161003/org-crypt.el b/elpa/org-20161010/org-crypt.el
similarity index 100%
rename from elpa/org-20161003/org-crypt.el
rename to elpa/org-20161010/org-crypt.el
diff --git a/elpa/org-20161003/org-ctags.el b/elpa/org-20161010/org-ctags.el
similarity index 100%
rename from elpa/org-20161003/org-ctags.el
rename to elpa/org-20161010/org-ctags.el
diff --git a/elpa/org-20161003/org-datetree.el b/elpa/org-20161010/org-datetree.el
similarity index 100%
rename from elpa/org-20161003/org-datetree.el
rename to elpa/org-20161010/org-datetree.el
diff --git a/elpa/org-20161003/org-docview.el b/elpa/org-20161010/org-docview.el
similarity index 100%
rename from elpa/org-20161003/org-docview.el
rename to elpa/org-20161010/org-docview.el
diff --git a/elpa/org-20161003/org-element.el b/elpa/org-20161010/org-element.el
similarity index 100%
rename from elpa/org-20161003/org-element.el
rename to elpa/org-20161010/org-element.el
diff --git a/elpa/org-20161003/org-entities.el b/elpa/org-20161010/org-entities.el
similarity index 100%
rename from elpa/org-20161003/org-entities.el
rename to elpa/org-20161010/org-entities.el
diff --git a/elpa/org-20161003/org-eshell.el b/elpa/org-20161010/org-eshell.el
similarity index 100%
rename from elpa/org-20161003/org-eshell.el
rename to elpa/org-20161010/org-eshell.el
diff --git a/elpa/org-20161003/org-faces.el b/elpa/org-20161010/org-faces.el
similarity index 100%
rename from elpa/org-20161003/org-faces.el
rename to elpa/org-20161010/org-faces.el
diff --git a/elpa/org-20161003/org-feed.el b/elpa/org-20161010/org-feed.el
similarity index 100%
rename from elpa/org-20161003/org-feed.el
rename to elpa/org-20161010/org-feed.el
diff --git a/elpa/org-20161003/org-footnote.el b/elpa/org-20161010/org-footnote.el
similarity index 100%
rename from elpa/org-20161003/org-footnote.el
rename to elpa/org-20161010/org-footnote.el
diff --git a/elpa/org-20161003/org-gnus.el b/elpa/org-20161010/org-gnus.el
similarity index 100%
rename from elpa/org-20161003/org-gnus.el
rename to elpa/org-20161010/org-gnus.el
diff --git a/elpa/org-20161003/org-habit.el b/elpa/org-20161010/org-habit.el
similarity index 100%
rename from elpa/org-20161003/org-habit.el
rename to elpa/org-20161010/org-habit.el
diff --git a/elpa/org-20161003/org-id.el b/elpa/org-20161010/org-id.el
similarity index 100%
rename from elpa/org-20161003/org-id.el
rename to elpa/org-20161010/org-id.el
diff --git a/elpa/org-20161003/org-indent.el b/elpa/org-20161010/org-indent.el
similarity index 100%
rename from elpa/org-20161003/org-indent.el
rename to elpa/org-20161010/org-indent.el
diff --git a/elpa/org-20161003/org-info.el b/elpa/org-20161010/org-info.el
similarity index 100%
rename from elpa/org-20161003/org-info.el
rename to elpa/org-20161010/org-info.el
diff --git a/elpa/org-20161003/org-inlinetask.el b/elpa/org-20161010/org-inlinetask.el
similarity index 100%
rename from elpa/org-20161003/org-inlinetask.el
rename to elpa/org-20161010/org-inlinetask.el
diff --git a/elpa/org-20161003/org-install.el b/elpa/org-20161010/org-install.el
similarity index 100%
rename from elpa/org-20161003/org-install.el
rename to elpa/org-20161010/org-install.el
diff --git a/elpa/org-20161003/org-irc.el b/elpa/org-20161010/org-irc.el
similarity index 100%
rename from elpa/org-20161003/org-irc.el
rename to elpa/org-20161010/org-irc.el
diff --git a/elpa/org-20161003/org-lint.el b/elpa/org-20161010/org-lint.el
similarity index 100%
rename from elpa/org-20161003/org-lint.el
rename to elpa/org-20161010/org-lint.el
diff --git a/elpa/org-20161003/org-list.el b/elpa/org-20161010/org-list.el
similarity index 100%
rename from elpa/org-20161003/org-list.el
rename to elpa/org-20161010/org-list.el
diff --git a/elpa/org-20161003/org-loaddefs.el b/elpa/org-20161010/org-loaddefs.el
similarity index 99%
rename from elpa/org-20161003/org-loaddefs.el
rename to elpa/org-20161010/org-loaddefs.el
index 2bc0e4a..6c232b4 100644
--- a/elpa/org-20161003/org-loaddefs.el
+++ b/elpa/org-20161010/org-loaddefs.el
@@ -298,7 +298,7 @@ used to limit the exported source code blocks by language.
 ;;;;;;  org-search-view org-agenda-list org-batch-store-agenda-views
 ;;;;;;  org-store-agenda-views org-batch-agenda-csv org-batch-agenda
 ;;;;;;  org-agenda org-toggle-sticky-agenda) "org-agenda" "org-agenda.el"
-;;;;;;  (22487 35371))
+;;;;;;  (22516 35627))
 ;;; Generated autoloads from org-agenda.el
 
 (autoload 'org-toggle-sticky-agenda "org-agenda" "\
@@ -2003,7 +2003,7 @@ using three `C-u' prefix arguments.
 ;;;***
 
 ;;;### (autoloads (org-git-version org-release) "org-version" "org-version.el"
-;;;;;;  (22513 58839))
+;;;;;;  (22523 8279))
 ;;; Generated autoloads from org-version.el
 
 (autoload 'org-release "org-version" "\
diff --git a/elpa/org-20161003/org-macro.el b/elpa/org-20161010/org-macro.el
similarity index 100%
rename from elpa/org-20161003/org-macro.el
rename to elpa/org-20161010/org-macro.el
diff --git a/elpa/org-20161003/org-macs.el b/elpa/org-20161010/org-macs.el
similarity index 100%
rename from elpa/org-20161003/org-macs.el
rename to elpa/org-20161010/org-macs.el
diff --git a/elpa/org-20161003/org-mhe.el b/elpa/org-20161010/org-mhe.el
similarity index 100%
rename from elpa/org-20161003/org-mhe.el
rename to elpa/org-20161010/org-mhe.el
diff --git a/elpa/org-20161003/org-mobile.el b/elpa/org-20161010/org-mobile.el
similarity index 100%
rename from elpa/org-20161003/org-mobile.el
rename to elpa/org-20161010/org-mobile.el
diff --git a/elpa/org-20161003/org-mouse.el b/elpa/org-20161010/org-mouse.el
similarity index 100%
rename from elpa/org-20161003/org-mouse.el
rename to elpa/org-20161010/org-mouse.el
diff --git a/elpa/org-20161003/org-pcomplete.el b/elpa/org-20161010/org-pcomplete.el
similarity index 100%
rename from elpa/org-20161003/org-pcomplete.el
rename to elpa/org-20161010/org-pcomplete.el
diff --git a/elpa/org-20161010/org-pkg.el b/elpa/org-20161010/org-pkg.el
new file mode 100644
index 0000000..08697e8
--- /dev/null
+++ b/elpa/org-20161010/org-pkg.el
@@ -0,0 +1,3 @@
+(define-package "org"
+  "20161010" "Outline-based notes management and organizer" ( ))
+;; no-byte-compile: t
diff --git a/elpa/org-20161003/org-plot.el b/elpa/org-20161010/org-plot.el
similarity index 100%
rename from elpa/org-20161003/org-plot.el
rename to elpa/org-20161010/org-plot.el
diff --git a/elpa/org-20161003/org-protocol.el b/elpa/org-20161010/org-protocol.el
similarity index 100%
rename from elpa/org-20161003/org-protocol.el
rename to elpa/org-20161010/org-protocol.el
diff --git a/elpa/org-20161003/org-rmail.el b/elpa/org-20161010/org-rmail.el
similarity index 100%
rename from elpa/org-20161003/org-rmail.el
rename to elpa/org-20161010/org-rmail.el
diff --git a/elpa/org-20161003/org-src.el b/elpa/org-20161010/org-src.el
similarity index 100%
rename from elpa/org-20161003/org-src.el
rename to elpa/org-20161010/org-src.el
diff --git a/elpa/org-20161003/org-table.el b/elpa/org-20161010/org-table.el
similarity index 100%
rename from elpa/org-20161003/org-table.el
rename to elpa/org-20161010/org-table.el
diff --git a/elpa/org-20161003/org-timer.el b/elpa/org-20161010/org-timer.el
similarity index 100%
rename from elpa/org-20161003/org-timer.el
rename to elpa/org-20161010/org-timer.el
diff --git a/elpa/org-20161003/org-version.el b/elpa/org-20161010/org-version.el
similarity index 92%
rename from elpa/org-20161003/org-version.el
rename to elpa/org-20161010/org-version.el
index 126c590..6cb1ec8 100644
--- a/elpa/org-20161003/org-version.el
+++ b/elpa/org-20161010/org-version.el
@@ -11,7 +11,7 @@
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "8.3.6-6-g194e51-elpa"))
+   (let ((org-git-version "8.3.6-7-g4d7d52-elpa"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"
diff --git a/elpa/org-20161003/org-w3m.el b/elpa/org-20161010/org-w3m.el
similarity index 100%
rename from elpa/org-20161003/org-w3m.el
rename to elpa/org-20161010/org-w3m.el
diff --git a/elpa/org-20161003/org.el b/elpa/org-20161010/org.el
similarity index 100%
rename from elpa/org-20161003/org.el
rename to elpa/org-20161010/org.el
diff --git a/elpa/org-20161003/orgcard.pdf b/elpa/org-20161010/orgcard.pdf
similarity index 99%
rename from elpa/org-20161003/orgcard.pdf
rename to elpa/org-20161010/orgcard.pdf
index cf06902..a5dde3e 100644
Binary files a/elpa/org-20161003/orgcard.pdf and b/elpa/org-20161010/orgcard.pdf differ
diff --git a/elpa/org-20161003/ox-ascii.el b/elpa/org-20161010/ox-ascii.el
similarity index 100%
rename from elpa/org-20161003/ox-ascii.el
rename to elpa/org-20161010/ox-ascii.el
diff --git a/elpa/org-20161003/ox-beamer.el b/elpa/org-20161010/ox-beamer.el
similarity index 100%
rename from elpa/org-20161003/ox-beamer.el
rename to elpa/org-20161010/ox-beamer.el
diff --git a/elpa/org-20161003/ox-html.el b/elpa/org-20161010/ox-html.el
similarity index 100%
rename from elpa/org-20161003/ox-html.el
rename to elpa/org-20161010/ox-html.el
diff --git a/elpa/org-20161003/ox-icalendar.el b/elpa/org-20161010/ox-icalendar.el
similarity index 100%
rename from elpa/org-20161003/ox-icalendar.el
rename to elpa/org-20161010/ox-icalendar.el
diff --git a/elpa/org-20161003/ox-latex.el b/elpa/org-20161010/ox-latex.el
similarity index 100%
rename from elpa/org-20161003/ox-latex.el
rename to elpa/org-20161010/ox-latex.el
diff --git a/elpa/org-20161003/ox-man.el b/elpa/org-20161010/ox-man.el
similarity index 100%
rename from elpa/org-20161003/ox-man.el
rename to elpa/org-20161010/ox-man.el
diff --git a/elpa/org-20161003/ox-md.el b/elpa/org-20161010/ox-md.el
similarity index 100%
rename from elpa/org-20161003/ox-md.el
rename to elpa/org-20161010/ox-md.el
diff --git a/elpa/org-20161003/ox-odt.el b/elpa/org-20161010/ox-odt.el
similarity index 100%
rename from elpa/org-20161003/ox-odt.el
rename to elpa/org-20161010/ox-odt.el
diff --git a/elpa/org-20161003/ox-org.el b/elpa/org-20161010/ox-org.el
similarity index 100%
rename from elpa/org-20161003/ox-org.el
rename to elpa/org-20161010/ox-org.el
diff --git a/elpa/org-20161003/ox-publish.el b/elpa/org-20161010/ox-publish.el
similarity index 100%
rename from elpa/org-20161003/ox-publish.el
rename to elpa/org-20161010/ox-publish.el
diff --git a/elpa/org-20161003/ox-texinfo.el b/elpa/org-20161010/ox-texinfo.el
similarity index 100%
rename from elpa/org-20161003/ox-texinfo.el
rename to elpa/org-20161010/ox-texinfo.el
diff --git a/elpa/org-20161003/ox.el b/elpa/org-20161010/ox.el
similarity index 100%
rename from elpa/org-20161003/ox.el
rename to elpa/org-20161010/ox.el
diff --git a/elpa/wakatime-mode-20161006.431/wakatime-mode-autoloads.el b/elpa/wakatime-mode-20161011.101/wakatime-mode-autoloads.el
similarity index 93%
rename from elpa/wakatime-mode-20161006.431/wakatime-mode-autoloads.el
rename to elpa/wakatime-mode-20161011.101/wakatime-mode-autoloads.el
index 15a73df..3a45ae9 100644
--- a/elpa/wakatime-mode-20161006.431/wakatime-mode-autoloads.el
+++ b/elpa/wakatime-mode-20161011.101/wakatime-mode-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "wakatime-mode" "wakatime-mode.el" (22518 23927
-;;;;;;  818086 242000))
+;;;### (autoloads nil "wakatime-mode" "wakatime-mode.el" (22525 59330
+;;;;;;  64474 256000))
 ;;; Generated autoloads from wakatime-mode.el
 
 (autoload 'wakatime-mode "wakatime-mode" "\
diff --git a/elpa/wakatime-mode-20161006.431/wakatime-mode-pkg.el b/elpa/wakatime-mode-20161011.101/wakatime-mode-pkg.el
similarity index 60%
rename from elpa/wakatime-mode-20161006.431/wakatime-mode-pkg.el
rename to elpa/wakatime-mode-20161011.101/wakatime-mode-pkg.el
index 5c25049..e234e71 100644
--- a/elpa/wakatime-mode-20161006.431/wakatime-mode-pkg.el
+++ b/elpa/wakatime-mode-20161011.101/wakatime-mode-pkg.el
@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "wakatime-mode" "20161006.431" "Automatic time tracking extension for WakaTime" 'nil :keywords '("calendar" "comm"))
+(define-package "wakatime-mode" "20161011.101" "Automatic time tracking extension for WakaTime" 'nil :keywords '("calendar" "comm"))
diff --git a/elpa/wakatime-mode-20161006.431/wakatime-mode.el b/elpa/wakatime-mode-20161011.101/wakatime-mode.el
similarity index 99%
rename from elpa/wakatime-mode-20161006.431/wakatime-mode.el
rename to elpa/wakatime-mode-20161011.101/wakatime-mode.el
index 47d3122..e0cd879 100644
--- a/elpa/wakatime-mode-20161006.431/wakatime-mode.el
+++ b/elpa/wakatime-mode-20161011.101/wakatime-mode.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Alan Hamlett <alan@wakatime.com>
 ;; Website: https://wakatime.com
 ;; Keywords: calendar, comm
-;; Package-Version: 20161006.431
+;; Package-Version: 20161011.101
 ;; Version: 1.0.2
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -187,7 +187,7 @@
              (when (and (not (= 0 exit-status)) (not (= 102 exit-status)))
                (error "WakaTime Error (%s)" exit-status)
              )
-             (when (= 102 exit-status)
+             (when (= 104 exit-status)
                ; If we are retrying already, error out
                (if ,retrying
                    (error "WakaTime Error (%s)" exit-status)