diff --git a/emacs/.emacs b/emacs/.emacs
index 4986f5a..0097234 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -25,6 +25,9 @@
 ;; Disable backup
 (setq make-backup-files nil)
 
+;; Treat underscore as part of word
+(modify-syntax-entry ?_ "w")
+
 (push '("melpa" . "http://melpa.milkbox.net/packages/") package-archives)
 
 (custom-set-variables
@@ -130,7 +133,6 @@
 (use-package org
   :ensure t)
 
-
 ;; Evil-mode
 (use-package evil
   :ensure t
@@ -143,6 +145,11 @@
   (define-key evil-motion-state-map [mouse-1] 'silence)
   (setq-default evil-cross-lines t))
 
+(use-package projectile
+  :ensure t
+  :demand t
+  :config (projectile-global-mode t))
+
 ;; Auto-Complete
 (use-package auto-complete
   :ensure t
@@ -161,6 +168,13 @@
 			(setq ivy-count-format "(%d/%d) ")
 			(define-key ivy-minibuffer-map (kbd "<C-return>") 'ivy-immediate-done)))
 
+;; Quickly open external terminal
+(use-package terminal-here
+  :ensure t
+  :demand t
+  :config (progn
+			(global-set-key (kbd "C-x t") #'terminal-here-launch)))
+
 ;; swiper
 (use-package swiper
   :ensure t
@@ -211,11 +225,11 @@
 ;; Easy terminal
 (setq my/default-shell (or (executable-find "zsh") (executable-find "bash")))
 
-(use-package shell-pop
-  :ensure t
-  :bind ("C-x t" . shell-pop)
-  :config
-  (setq-default shell-pop-term-shell my/default-shell))
+;;(use-package shell-pop
+;;  :ensure t
+;;  :bind ("C-x t" . shell-pop)
+;;  :config
+;;  (setq-default shell-pop-term-shell my/default-shell))
 
 ;; tabbing (doesn't really work yet)
 (setq-default indent-tabs-mode t)