Merge pull request #613 from roryk/upstream

fix for evil-mode in terminal

modules/prelude-evil.el

@@ -48,6 +48,9 @@
 (setq evil-insert-state-cursor '("gray" bar))
 (setq evil-motion-state-cursor '("gray" box))
 
+;; prevent esc-key from translating to meta-key in terminal mode
+(setq evil-esc-delay 0)
+
 (evil-mode 1)
 (global-evil-surround-mode 1)