diff --git a/elpa/bind-key-2.4/bind-key-autoloads.el b/elpa/bind-key-2.4.1/bind-key-autoloads.el
similarity index 88%
rename from elpa/bind-key-2.4/bind-key-autoloads.el
rename to elpa/bind-key-2.4.1/bind-key-autoloads.el
index 7f4d424..18ae5b7 100644
--- a/elpa/bind-key-2.4/bind-key-autoloads.el
+++ b/elpa/bind-key-2.4.1/bind-key-autoloads.el
@@ -19,11 +19,13 @@ spelled-out keystrokes, e.g., \"C-c C-z\". See documentation of
 
 COMMAND must be an interactive function or lambda form.
 
-KEYMAP, if present, should be a keymap and not a quoted symbol.
+KEYMAP, if present, should be a keymap variable or symbol.
 For example:
 
   (bind-key \"M-h\" #'some-interactive-function my-mode-map)
 
+  (bind-key \"M-h\" #'some-interactive-function 'my-mode-map)
+
 If PREDICATE is non-nil, it is a form evaluated to determine when
 a key should be bound. It must return non-nil in such cases.
 Emacs can evaluate this form at any time that it does redisplay
@@ -67,11 +69,9 @@ function symbol (unquoted).
 \(fn &rest ARGS)" nil t)
 
 (autoload 'describe-personal-keybindings "bind-key" "\
-Display all the personal keybindings defined by `bind-key'.
+Display all the personal keybindings defined by `bind-key'." t nil)
 
-\(fn)" t nil)
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "bind-key" '("compare-keybindings" "get-binding-description" "bind-key" "personal-keybindings" "override-global-m")))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "bind-key" '("bind-key" "compare-keybindings" "get-binding-description" "override-global-m" "personal-keybindings")))
 
 ;;;***
 
diff --git a/elpa/bind-key-2.4.1/bind-key-pkg.el b/elpa/bind-key-2.4.1/bind-key-pkg.el
new file mode 100644
index 0000000..d0f396e
--- /dev/null
+++ b/elpa/bind-key-2.4.1/bind-key-pkg.el
@@ -0,0 +1,2 @@
+;;; Generated package description from bind-key-2.4.1/bind-key.el  -*- no-byte-compile: t -*-
+(define-package "bind-key" "2.4.1" "A simple way to manage personal keybindings" 'nil :commit "caa92f1d64fc25480551757d854b4b49981dfa6b" :keywords '("keys" "keybinding" "config" "dotemacs") :authors '(("John Wiegley" . "johnw@newartisans.com")) :maintainer '("John Wiegley" . "johnw@newartisans.com") :url "https://github.com/jwiegley/use-package")
diff --git a/elpa/bind-key-2.4/bind-key.el b/elpa/bind-key-2.4.1/bind-key.el
similarity index 96%
rename from elpa/bind-key-2.4/bind-key.el
rename to elpa/bind-key-2.4.1/bind-key.el
index a28351f..b441bc4 100644
--- a/elpa/bind-key-2.4/bind-key.el
+++ b/elpa/bind-key-2.4.1/bind-key.el
@@ -7,7 +7,8 @@
 ;; Created: 16 Jun 2012
 ;; Modified: 29 Nov 2017
 ;; Version: 2.4
-;; Package-Version: 2.4
+;; Package-Version: 2.4.1
+;; Package-Commit: caa92f1d64fc25480551757d854b4b49981dfa6b
 ;; Keywords: keys keybinding config dotemacs
 ;; URL: https://github.com/jwiegley/use-package
 
@@ -95,7 +96,7 @@
 ;;
 ;;   M-x describe-personal-keybindings
 ;;
-;; This display will tell you if you've overriden a default keybinding, and
+;; This display will tell you if you've overridden a default keybinding, and
 ;; what the default was.  Also, it will tell you if the key was rebound after
 ;; your binding it with `bind-key', and what it was rebound it to.
 
@@ -155,11 +156,13 @@ spelled-out keystrokes, e.g., \"C-c C-z\". See documentation of
 
 COMMAND must be an interactive function or lambda form.
 
-KEYMAP, if present, should be a keymap and not a quoted symbol.
+KEYMAP, if present, should be a keymap variable or symbol.
 For example:
 
   (bind-key \"M-h\" #'some-interactive-function my-mode-map)
 
+  (bind-key \"M-h\" #'some-interactive-function 'my-mode-map)
+
 If PREDICATE is non-nil, it is a form evaluated to determine when
 a key should be bound. It must return non-nil in such cases.
 Emacs can evaluate this form at any time that it does redisplay
@@ -172,10 +175,11 @@ can safely be called at any time."
     `(let* ((,namevar ,key-name)
             (,keyvar (if (vectorp ,namevar) ,namevar
                        (read-kbd-macro ,namevar)))
+            (kmap (if (and ,keymap (symbolp ,keymap)) (symbol-value ,keymap) ,keymap))
             (,kdescvar (cons (if (stringp ,namevar) ,namevar
                                (key-description ,namevar))
-                             (quote ,keymap)))
-            (,bindingvar (lookup-key (or ,keymap global-map) ,keyvar)))
+                             (if (symbolp ,keymap) ,keymap (quote ,keymap))))
+            (,bindingvar (lookup-key (or kmap global-map) ,keyvar)))
        (let ((entry (assoc ,kdescvar personal-keybindings))
              (details (list ,command
                             (unless (numberp ,bindingvar)
@@ -184,11 +188,11 @@ can safely be called at any time."
              (setcdr entry details)
            (add-to-list 'personal-keybindings (cons ,kdescvar details))))
        ,(if predicate
-            `(define-key (or ,keymap global-map) ,keyvar
+            `(define-key (or kmap global-map) ,keyvar
                '(menu-item "" nil :filter (lambda (&optional _)
                                             (when ,predicate
                                               ,command))))
-          `(define-key (or ,keymap global-map) ,keyvar ,command)))))
+          `(define-key (or kmap global-map) ,keyvar ,command)))))
 
 ;;;###autoload
 (defmacro unbind-key (key-name &optional keymap)
diff --git a/elpa/bind-key-2.4/bind-key-pkg.el b/elpa/bind-key-2.4/bind-key-pkg.el
deleted file mode 100644
index b4ca946..0000000
--- a/elpa/bind-key-2.4/bind-key-pkg.el
+++ /dev/null
@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "bind-key" "2.4" "A simple way to manage personal keybindings" 'nil :commit "39a8b8812c2c9f6f0b299e6a04e504ef393694ce" :keywords '("keys" "keybinding" "config" "dotemacs") :authors '(("John Wiegley" . "johnw@newartisans.com")) :maintainer '("John Wiegley" . "johnw@newartisans.com") :url "https://github.com/jwiegley/use-package")
diff --git a/elpa/use-package-2.4/dir b/elpa/use-package-2.4.1/dir
similarity index 100%
rename from elpa/use-package-2.4/dir
rename to elpa/use-package-2.4.1/dir
diff --git a/elpa/use-package-2.4/use-package-autoloads.el b/elpa/use-package-2.4.1/use-package-autoloads.el
similarity index 91%
rename from elpa/use-package-2.4/use-package-autoloads.el
rename to elpa/use-package-2.4.1/use-package-autoloads.el
index 503f5db..d5afb09 100644
--- a/elpa/use-package-2.4/use-package-autoloads.el
+++ b/elpa/use-package-2.4.1/use-package-autoloads.el
@@ -90,6 +90,7 @@ this file.  Usage:
                  package.  This is useful if the package is being lazily
                  loaded, and you wish to conditionally call functions in your
                  `:init' block that are defined in the package.
+:hook            Specify hook(s) to attach this package to.
 
 :bind            Bind keys, and define autoloads for the bound commands.
 :bind*           Bind keys, and define autoloads for the bound commands,
@@ -99,13 +100,15 @@ this file.  Usage:
 :bind-keymap*    Like `:bind-keymap', but overrides all minor mode bindings
 
 :defer           Defer loading of a package -- this is implied when using
-                 `:commands', `:bind', `:bind*', `:mode', `:magic',
+                 `:commands', `:bind', `:bind*', `:mode', `:magic', `:hook',
                  `:magic-fallback', or `:interpreter'.  This can be an integer,
                  to force loading after N seconds of idle time, if the package
                  has not already been loaded.
-:after           Defer loading of a package until after any of the named
-                 features are loaded.
-:demand          Prevent deferred loading in all cases.
+:after           Delay the use-package declaration until after the named modules
+                 have loaded. Once load, it will be as though the use-package
+                 declaration (without `:after') had been seen at that moment.
+:demand          Prevent the automatic deferred loading introduced by constructs
+                 such as `:bind' (see `:defer' for the complete list).
 
 :if EXPR         Initialize and load only if EXPR evaluates to a non-nil value.
 :disabled        The package is ignored completely if this keyword is present.
@@ -114,7 +117,9 @@ this file.  Usage:
 :load-path       Add to the `load-path' before attempting to load the package.
 :diminish        Support for diminish.el (if installed).
 :delight         Support for delight.el (if installed).
-:custom          Call `customize-set-variable' with each variable definition.
+:custom          Call `custom-set' or `set-default' with each variable
+                 definition without modifying the Emacs `custom-file'.
+                 (compare with `custom-set-variables').
 :custom-face     Call `customize-set-faces' with each face definition.
 :ensure          Loads the package using package.el if necessary.
 :pin             Pin the package to an archive.
@@ -205,9 +210,7 @@ instead.
 (autoload 'use-package-lint "use-package-lint" "\
 Check for errors in use-package declarations.
 For example, if the module's `:if' condition is met, but even
-with the specified `:load-path' the module cannot be found.
-
-\(fn)" t nil)
+with the specified `:load-path' the module cannot be found." t nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "use-package-lint" '("use-package-lint-declaration")))
 
diff --git a/elpa/use-package-2.4/use-package-bind-key.el b/elpa/use-package-2.4.1/use-package-bind-key.el
similarity index 100%
rename from elpa/use-package-2.4/use-package-bind-key.el
rename to elpa/use-package-2.4.1/use-package-bind-key.el
diff --git a/elpa/use-package-2.4/use-package-core.el b/elpa/use-package-2.4.1/use-package-core.el
similarity index 97%
rename from elpa/use-package-2.4/use-package-core.el
rename to elpa/use-package-2.4.1/use-package-core.el
index 7fc840f..cd5b907 100644
--- a/elpa/use-package-2.4/use-package-core.el
+++ b/elpa/use-package-2.4.1/use-package-core.el
@@ -6,7 +6,7 @@
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 ;; Created: 17 Jun 2012
 ;; Modified: 29 Nov 2017
-;; Version: 2.4
+;; Version: 2.4.1
 ;; Package-Requires: ((emacs "24.3"))
 ;; Keywords: dotemacs startup speed config package
 ;; URL: https://github.com/jwiegley/use-package
@@ -56,7 +56,7 @@
   "A use-package declaration for simplifying your `.emacs'."
   :group 'startup)
 
-(defconst use-package-version "2.4"
+(defconst use-package-version "2.4.1"
   "This version of use-package.")
 
 (defcustom use-package-keywords
@@ -651,7 +651,8 @@ extending any keys already present."
                     ,(when (eq use-package-verbose 'debug)
                        `(message ,(format "Compiling package %s" name-string)))
                     ,(unless (plist-get args :no-require)
-                       `(load ,name-string nil t)))))))))
+                       `(unless (featurep ',name-symbol)
+                          (load ,name-string nil t))))))))))
 
     ;; Certain keywords imply :defer, if :demand was not specified.
     (when (and (not (plist-member args :demand))
@@ -1028,11 +1029,11 @@ meaning:
   "use-package statistics"
   "Show current statistics gathered about use-package declarations."
   (setq tabulated-list-format
-        ;; The sum of column width is 80 caracters:
-        #[("Package" 25 t)
-          ("Status" 13 t)
-          ("Last Event" 23 t)
-          ("Time" 10 t)])
+        ;; The sum of column width is 80 characters:
+        [("Package" 25 t)
+         ("Status" 13 t)
+         ("Last Event" 23 t)
+         ("Time" 10 t)])
   (tabulated-list-init-header))
 
 (defun use-package-statistics-gather (keyword name after)
@@ -1393,7 +1394,9 @@ no keyword implies `:all'."
               (comment (nth 2 def)))
           (unless (and comment (stringp comment))
             (setq comment (format "Customized with use-package %s" name)))
-          `(customize-set-variable (quote ,variable) ,value ,comment)))
+          `(funcall (or (get (quote ,variable) 'custom-set) #'set-default)
+                    (quote ,variable)
+                    ,value)))
     args)
    (use-package-process-keywords name rest state)))
 
@@ -1419,7 +1422,7 @@ no keyword implies `:all'."
 (defun use-package-handler/:custom-face (name _keyword args rest state)
   "Generate use-package custom-face keyword code."
   (use-package-concat
-   (mapcar #'(lambda (def) `(custom-set-faces (quote ,def))) args)
+   (mapcar #'(lambda (def) `(custom-set-faces (backquote ,def))) args)
    (use-package-process-keywords name rest state)))
 
 ;;;; :init
@@ -1467,7 +1470,7 @@ no keyword implies `:all'."
     (use-package-concat
      (when use-package-compute-statistics
        `((use-package-statistics-gather :config ',name nil)))
-     (if (or (null arg) (equal arg '(t)))
+     (if (and (or (null arg) (equal arg '(t))) (not use-package-inject-hooks))
          body
        (use-package-with-elapsed-timer
            (format "Configuring package %s" name-symbol)
@@ -1533,6 +1536,7 @@ this file.  Usage:
                  package.  This is useful if the package is being lazily
                  loaded, and you wish to conditionally call functions in your
                  `:init' block that are defined in the package.
+:hook            Specify hook(s) to attach this package to.
 
 :bind            Bind keys, and define autoloads for the bound commands.
 :bind*           Bind keys, and define autoloads for the bound commands,
@@ -1542,13 +1546,15 @@ this file.  Usage:
 :bind-keymap*    Like `:bind-keymap', but overrides all minor mode bindings
 
 :defer           Defer loading of a package -- this is implied when using
-                 `:commands', `:bind', `:bind*', `:mode', `:magic',
+                 `:commands', `:bind', `:bind*', `:mode', `:magic', `:hook',
                  `:magic-fallback', or `:interpreter'.  This can be an integer,
                  to force loading after N seconds of idle time, if the package
                  has not already been loaded.
-:after           Defer loading of a package until after any of the named
-                 features are loaded.
-:demand          Prevent deferred loading in all cases.
+:after           Delay the use-package declaration until after the named modules
+                 have loaded. Once load, it will be as though the use-package
+                 declaration (without `:after') had been seen at that moment.
+:demand          Prevent the automatic deferred loading introduced by constructs
+                 such as `:bind' (see `:defer' for the complete list).
 
 :if EXPR         Initialize and load only if EXPR evaluates to a non-nil value.
 :disabled        The package is ignored completely if this keyword is present.
@@ -1557,7 +1563,9 @@ this file.  Usage:
 :load-path       Add to the `load-path' before attempting to load the package.
 :diminish        Support for diminish.el (if installed).
 :delight         Support for delight.el (if installed).
-:custom          Call `customize-set-variable' with each variable definition.
+:custom          Call `custom-set' or `set-default' with each variable
+                 definition without modifying the Emacs `custom-file'.
+                 (compare with `custom-set-variables').
 :custom-face     Call `customize-set-faces' with each face definition.
 :ensure          Loads the package using package.el if necessary.
 :pin             Pin the package to an archive."
diff --git a/elpa/use-package-2.4/use-package-delight.el b/elpa/use-package-2.4.1/use-package-delight.el
similarity index 100%
rename from elpa/use-package-2.4/use-package-delight.el
rename to elpa/use-package-2.4.1/use-package-delight.el
diff --git a/elpa/use-package-2.4/use-package-diminish.el b/elpa/use-package-2.4.1/use-package-diminish.el
similarity index 100%
rename from elpa/use-package-2.4/use-package-diminish.el
rename to elpa/use-package-2.4.1/use-package-diminish.el
diff --git a/elpa/use-package-2.4/use-package-ensure.el b/elpa/use-package-2.4.1/use-package-ensure.el
similarity index 100%
rename from elpa/use-package-2.4/use-package-ensure.el
rename to elpa/use-package-2.4.1/use-package-ensure.el
diff --git a/elpa/use-package-2.4/use-package-jump.el b/elpa/use-package-2.4.1/use-package-jump.el
similarity index 100%
rename from elpa/use-package-2.4/use-package-jump.el
rename to elpa/use-package-2.4.1/use-package-jump.el
diff --git a/elpa/use-package-2.4/use-package-lint.el b/elpa/use-package-2.4.1/use-package-lint.el
similarity index 100%
rename from elpa/use-package-2.4/use-package-lint.el
rename to elpa/use-package-2.4.1/use-package-lint.el
diff --git a/elpa/use-package-2.4.1/use-package-pkg.el b/elpa/use-package-2.4.1/use-package-pkg.el
new file mode 100644
index 0000000..34400ae
--- /dev/null
+++ b/elpa/use-package-2.4.1/use-package-pkg.el
@@ -0,0 +1,13 @@
+(define-package "use-package" "2.4.1" "A configuration macro for simplifying your .emacs"
+  '((emacs "24.3")
+    (bind-key "2.4"))
+  :commit "caa92f1d64fc25480551757d854b4b49981dfa6b" :keywords
+  ("dotemacs" "startup" "speed" "config" "package")
+  :authors
+  (("John Wiegley" . "johnw@newartisans.com"))
+  :maintainer
+  ("John Wiegley" . "johnw@newartisans.com")
+  :url "https://github.com/jwiegley/use-package")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/elpa/use-package-2.4/use-package.el b/elpa/use-package-2.4.1/use-package.el
similarity index 99%
rename from elpa/use-package-2.4/use-package.el
rename to elpa/use-package-2.4.1/use-package.el
index 1a8fff8..0e194d5 100644
--- a/elpa/use-package-2.4/use-package.el
+++ b/elpa/use-package-2.4.1/use-package.el
@@ -6,7 +6,7 @@
 ;; Maintainer: John Wiegley <johnw@newartisans.com>
 ;; Created: 17 Jun 2012
 ;; Modified: 29 Nov 2017
-;; Version: 2.4
+;; Version: 2.4.1
 ;; Package-Requires: ((emacs "24.3") (bind-key "2.4"))
 ;; Keywords: dotemacs startup speed config package
 ;; URL: https://github.com/jwiegley/use-package
diff --git a/elpa/use-package-2.4/use-package.info b/elpa/use-package-2.4.1/use-package.info
similarity index 97%
rename from elpa/use-package-2.4/use-package.info
rename to elpa/use-package-2.4.1/use-package.info
index 8058d9c..e57c89a 100644
--- a/elpa/use-package-2.4/use-package.info
+++ b/elpa/use-package-2.4.1/use-package.info
@@ -231,7 +231,7 @@ for ‘load-path’.
 
    should display something like
 
-     use-package-version’s value is "2.4"
+     use-package-version’s value is "2.4.1"
 
    If you are completely new to use-package then see *note Getting
 Started::.
@@ -901,7 +901,7 @@ While the ‘:after’ keyword delays loading until the dependencies are
 loaded, the somewhat simpler ‘:requires’ keyword simply never loads the
 package if the dependencies are not available at the time the
 ‘use-package’ declaration is encountered.  By "available" in this
-context it means that ‘foo’ is available of ‘(featurep 'foo)’ evaulates
+context it means that ‘foo’ is available of ‘(featurep 'foo)’ evaluates
 to a non-nil value.  For example:
 
      (use-package abbrev
@@ -1008,37 +1008,37 @@ Node: Installation3306
 Node: Installing from an Elpa Archive3658
 Node: Installing from the Git Repository4773
 Node: Post-Installation Tasks6309
-Node: Getting Started7022
-Node: Keywords7194
-Node: after8113
-Node: bind-keymap bind-keymap*9645
-Node: bind bind*10698
-Node: Binding to local keymaps12738
-Node: commands13829
-Node: preface init config13971
-Node: custom16049
-Node: custom-face16489
-Node: defer demand16809
-Node: defines functions17621
-Node: diminish delight18766
-Node: disabled20709
-Node: ensure pin21204
-Node: hook23934
-Node: if when unless25352
-Node: load-path26298
-Node: mode interpreter27444
-Node: magic magic-fallback28755
-Node: no-require29600
-Node: requires30304
-Node: FAQ31191
-Node: FAQ - How to ...?31474
-Node: This is a question31646
-Node: FAQ - Issues and Errors31794
-Node: This is an issues31977
-Node: Debugging Tools32132
-Node: Command Index32306
-Node: Function Index32462
-Node: Variable Index32619
+Node: Getting Started7024
+Node: Keywords7196
+Node: after8115
+Node: bind-keymap bind-keymap*9647
+Node: bind bind*10700
+Node: Binding to local keymaps12740
+Node: commands13831
+Node: preface init config13973
+Node: custom16051
+Node: custom-face16491
+Node: defer demand16811
+Node: defines functions17623
+Node: diminish delight18768
+Node: disabled20711
+Node: ensure pin21206
+Node: hook23936
+Node: if when unless25354
+Node: load-path26300
+Node: mode interpreter27446
+Node: magic magic-fallback28757
+Node: no-require29602
+Node: requires30306
+Node: FAQ31193
+Node: FAQ - How to ...?31476
+Node: This is a question31648
+Node: FAQ - Issues and Errors31796
+Node: This is an issues31979
+Node: Debugging Tools32134
+Node: Command Index32308
+Node: Function Index32464
+Node: Variable Index32621
 
 End Tag Table
 
diff --git a/elpa/use-package-2.4/use-package-pkg.el b/elpa/use-package-2.4/use-package-pkg.el
deleted file mode 100644
index bf01364..0000000
--- a/elpa/use-package-2.4/use-package-pkg.el
+++ /dev/null
@@ -1,13 +0,0 @@
-(define-package "use-package" "2.4" "A configuration macro for simplifying your .emacs"
-  '((emacs "24.3")
-    (bind-key "2.4"))
-  :keywords
-  '("dotemacs" "startup" "speed" "config" "package")
-  :authors
-  '(("John Wiegley" . "johnw@newartisans.com"))
-  :maintainer
-  '("John Wiegley" . "johnw@newartisans.com")
-  :url "https://github.com/jwiegley/use-package")
-;; Local Variables:
-;; no-byte-compile: t
-;; End: