diff --git a/init.el b/init.el
index 622a804e02..40cfaa22a4 100644
--- a/init.el
+++ b/init.el
@@ -24,16 +24,16 @@
 
 (add-to-list 'load-path dotfiles-dir)
 
-(require 'package)
-(package-initialize)
-(require 'starter-kit-elpa)
-
 (add-to-list 'load-path (concat dotfiles-dir "/elpa-to-submit"))
 
 (setq autoload-file (concat dotfiles-dir "loaddefs.el"))
 (setq package-user-dir (concat dotfiles-dir "elpa"))
 (setq custom-file (concat dotfiles-dir "custom.el"))
 
+(require 'package)
+(package-initialize)
+(require 'starter-kit-elpa)
+
 ;; These should be loaded on startup rather than autoloaded on demand
 ;; since they are likely to be used in every session
 
diff --git a/starter-kit-elpa.el b/starter-kit-elpa.el
index ad463004c8..98ed4d68e5 100644
--- a/starter-kit-elpa.el
+++ b/starter-kit-elpa.el
@@ -9,6 +9,7 @@
                                    'inf-ruby
                                    'css-mode
                                    'yaml-mode
+                                   'find-file-in-project
                                    'magit
                                    'gist)
   "Libraries that should be installed by default.")
diff --git a/starter-kit-misc.el b/starter-kit-misc.el
index 56053a234c..3a7a9cf156 100644
--- a/starter-kit-misc.el
+++ b/starter-kit-misc.el
@@ -34,6 +34,9 @@
       xterm-mouse-mode t
       save-place-file (concat dotfiles-dir "places"))
 
+(add-to-list 'safe-local-variable-values '(lexical-binding . t))
+(add-to-list 'safe-local-variable-values '(whitespace-line-column . 80))
+
 ;; Set this to whatever browser you use
 ;; (setq browse-url-browser-function 'browse-url-firefox)
 ;; (setq browse-url-browser-function 'browse-default-macosx-browser)