diff --git a/dotfiles/emacs.d/eshell/history b/dotfiles/emacs.d/eshell/history
new file mode 100644
index 0000000..84e8d9c
--- /dev/null
+++ b/dotfiles/emacs.d/eshell/history
@@ -0,0 +1,15 @@
+ifconfig
+cls
+$TERM
+scheme
+ls
+scheme
+ping google.com
+git diff
+export TERM=rxvt-256color
+find
+npm
+clear
+ls
+npm
+clear
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index aa14130..ad8c933 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -14,6 +14,14 @@
 (require 'package)
 
 ;;--------------------------------------------------------------------------------------
+;; Generic line numbering disabler
+;;--------------------------------------------------------------------------------------
+
+(defun nolinum ()
+  (linum-mode 0)
+)
+
+;;--------------------------------------------------------------------------------------
 ;; Hide Startup Message
 ;;--------------------------------------------------------------------------------------
 
@@ -111,6 +119,9 @@
 	     (ibuffer-auto-mode 1)
 	     (ibuffer-switch-to-saved-filter-groups "default")))
 
+;; Disable eager line numbering
+(add-hook 'ibuffer-mode-hook 'nolinum)
+
 (setq ibuffer-expert t)
 
 (setq ibuffer-show-empty-filter-groups nil)
@@ -278,6 +289,56 @@
                                 (sh-set-shell "zsh"))))
 
 ;;-------------------------------------------------------------------------------------
+;; EShell Configuration
+;;-------------------------------------------------------------------------------------
+
+;; Enable ANSI colors in EShell
+(ansi-color-for-comint-mode-on)
+(defun eshell-handle-ansi-color ()
+  (ansi-color-apply-on-region eshell-last-output-start eshell-last-output-end)
+)
+
+(add-hook 'eshell-mode-hook
+          '(lambda ()
+             (add-to-list
+              'eshell-output-filter-functions
+              'eshell-handle-ansi-color))
+)
+
+;; Disable line numbers for EShell
+(add-hook 'eshell-mode-hook 'nolinum)
+
+;;Save EShell history on exit
+(setq eshell-save-history-on-exit t)
+
+;; History size
+(setq eshell-history-size 1024)
+
+;; Emulate Bash history save
+(setq eshell-hist-ignoreups t)
+
+;; Ignore dupes in history
+(setq eshell-hist-ignoredups t)
+
+;; Scroll to bottom on output
+(setq eshell-scroll-to-bottom-on-output t)
+
+;;; Below this section I'm defining convenience commands for EShell so it acts
+;;; a little more like a terminal you might be used to.
+
+;; Define the clear function
+(defun eshell/clear ()
+  (interactive)
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+)
+
+;; Info
+(defun eshell/info ()
+  (info)
+)
+
+;;-------------------------------------------------------------------------------------
 ;; Alignment
 ;;-------------------------------------------------------------------------------------
 
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index a760b9f..e585cb9 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -1,7 +1,7 @@
 (require 'cl)
 
 (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe framemove flycheck
-                         fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust
+                         esh-help fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust
                          flycheck-pos-tip gitignore-mode haskell-mode helm helm-ag helm-projectile
                          js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode powerline
                          projectile rust-mode color-theme-solarized wrap-region stylus-mode rainbow-delimiters)
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index bb7f65c..0de18bc 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -43,8 +43,6 @@ set-window-option -g clock-mode-colour green                     #green
 
 set-window-option -g window-status-bell-style fg=black,bg=red    #base02, red
 
-
-
 # Once the prefix is active these binds will matter
 # <prefix><Space> and <prefix><C-Space> take you to copy mode.
 
@@ -68,7 +66,6 @@ bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
 bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
 bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
 
-
 # Vim keybinds so copy mode behaves more like vim
 bind-key -t vi-copy 'v' begin-selection
 bind-key -t vi-copy 'y' copy-selection
@@ -76,7 +73,6 @@ bind-key -t vi-copy 'y' copy-selection
 # Vim keybind so that paste is done more naturally instead of with ]
 bind p paste-buffer
 
-
 ###################################
 #                                 #
 #         Custom Settings         #