@@ -41,7 +41,10 @@ (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")                              ("marmalade" . "http://marmalade-repo.org/packages/")
                              ("melpa-stable" . "http://stable.melpa.org/packages/")
                              ("melpa" . "http://melpa.org/packages/"))
-          package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa"))
+          package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa")
+          package-pinned-packages '(("use-package" . melpa-stable)
+                                    ("diminish" . melpa-stable)
+                                    ("bind-key" . melpa-stable)))
     (package-initialize)
     (unless (package-installed-p 'use-package)
       (package-refresh-contents)
@@ -51,7 +54,8 @@ (unless (featurep 'use-package)     (require 'diminish)
     (require 'bind-key))
   (setq use-package-verbose t
-        use-package-always-ensure t)
+        use-package-always-ensure t
+        package-enable-at-startup nil)
 #+END_SRC
 
 * Customize
@@ -747,8 +751,6 @@ (add-to-list 'auto-indent-disabled-modes-list 'nix-mode)               (add-to-list 'auto-indent-disabled-modes-list 'coffee-mode)
               (auto-indent-global-mode)))
 #+END_SRC
-
-*** TODO Check for auto-indentation of whitespace-sensitive languages.
 
 ** smart-tabs-mode
 

@@ -8,8 +8,6 @@ path=( 		$defpath
 		~/bin
 		$GOPATH/bin
-		~/.cabal/bin
-		~/.composer/vendor/bin
 	)
 fi