Merge branch 'master' of git.epichack.com:barak/dotfiles

.emacs.d/Cask

@@ -8,11 +8,13 @@
 (depends-on "auto-complete-clang")
 (depends-on "auto-complete-clang-async")
 (depends-on "cask")
+
 (depends-on "cedit")
 (depends-on "company-go")
 (depends-on "elpy")
 (depends-on "epc")
 (depends-on "evil")
+(depends-on "neotree" :git "https://github.com/jaypei/emacs-neotree")
 (depends-on "exec-path-from-shell")
 (depends-on "flx-ido")
 (depends-on "flycheck")

.emacs.d/init.el

@@ -86,7 +86,7 @@
 (setq ac-auto-start t) 
 (define-key ac-completing-map (kbd "<escape>") 'ac-stop)
 
-Company-mode autocomplete
+; Company-mode autocomplete
 (require 'company)                                   ; load company mode
 (require 'company-go)                                ; load company mode go backend
 (setq company-tooltip-limit 20)                      ; bigger popup window
@@ -101,6 +101,9 @@ Company-mode autocomplete
 (yas-load-directory (concat root-dir "snippets"))
 (yas-global-mode 1)
 
+;; Neotree
+(require 'neotree)
+
 ;; Evil Key Defines
 (define-key evil-normal-state-map "gc" 'kill-buffer-and-window)