Merge branch 'master' of github.com:tflucke/Work-Env

Conflicts:
	.Xresources

.Xresources

@@ -1,9 +1,14 @@
 #include ".Xresources.d/monitors"
 
-XTerm*metaSendsEscape: true
-XTerm*eightBitInput: false
-XTerm*Background: black
-XTerm*Foreground: green
+XTerm*metaSendsEscape:    true
+XTerm*eightBitInput:      false
+XTerm*Background:         black
+XTerm*Foreground:         green
+xterm*faceName:           Deja Vu Sans Mono
+xterm*faceSize:           10
+XTerm.vt100.backarrowKey: false
+XTerm.ttyModes:           erase ^?
+XTerm.vt100.saveLines:    2048
 
 Gnome-terminal*Background: black
-Gnome-terminal*Foreground: green
+Gnome-terminal*Foreground: green

.emacs.d/init.el

@@ -100,17 +100,22 @@
 (use-package scala-mode
   :commands (scala-mode))
 ;  :mode "\\.scala\\'"
-
-(use-package ensime
-  :disabled
-  :if (version<= "24.4" emacs-version)
-  :pin melpa-stable)
+(when (version<= "24.4" emacs-version)
+  (use-package ensime
+    :pin melpa-stable))
 
 ; --------- C Syntax checker ---------
 (use-package flycheck-irony
   :hook c-mode)
 ;  :mode ("\\.c\\'" "\\.h\\'")
 
+(use-package auto-complete)
+
+(use-package auto-complete-clang-async
+  :requires auto-complete
+  :hook c-mode
+  :mode ("\\.c\\'" "\\.h\\'"))
+
 ;; ------------ Web Mode ------------
 (use-package multi-web-mode
   :init
@@ -226,7 +231,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (xclip hl-todo comment-tags restclient markdown-mode autopair highlight-parentheses flyspell-correct-popup rust-mode rust-playground slime-volleyball use-package multi-web-mode magit ensime color-theme base16-theme))))
+    (auto-complete auto-complete-clang-async xclip hl-todo comment-tags restclient markdown-mode autopair highlight-parentheses flyspell-correct-popup rust-mode rust-playground slime-volleyball use-package multi-web-mode magit ensime color-theme base16-theme))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.