 
 (require 'projectile)
 (projectile-global-mode)
-(setq projectile-enable-caching -1)
 
 ;; Override some projectile keymaps
 (eval-after-load 'projectile

                      helm
                      projectile
                      helm-projectile

                      magit
                      git-gutter

    (ediff-merge-files-with-ancestor file1 file2 file3 nil file4)))

(add-to-list 'command-switch-alist '("merge" . command-line-merge))

(require 'neotree)
(global-set-key [f8] 'neotree-toggle)

(require 'flx-ido)
;(ido-mode 1)
