7 files changed, 23 insertions, 9 deletions
diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el
index 9fc5532..c561381 100644
--- a/settings/sane-defaults.el
+++ b/settings/sane-defaults.el
@@ -61,8 +61,8 @@
 (setq enable-recursive-minibuffers t)
 
 ;; More memory than even Magnars...cause the future keeps happening
-;; 50 MB should be good
-(setq gc-cons-threshold 50000000)
+;; 100 MB should be good
+(setq gc-cons-threshold 100000000)
 
 ;; warn when opening files bigger than 100MB
 (setq large-file-warning-threshold 100000000)
@@ -89,4 +89,13 @@
 
 (add-to-list 'find-file-not-found-functions 'my-create-non-existent-directory)
 
+(add-hook 'before-save-hook 'delete-trailing-whitespace)
+(set-default-coding-systems 'utf-8)
+(set-terminal-coding-system 'utf-8)
+(set-keyboard-coding-system 'utf-8)
+(setq default-buffer-file-coding-system 'utf-8)
+(setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING))
+
+(prefer-coding-system 'utf-8)
+
 (provide 'sane-defaults)
diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el
index 2c2e9b3..109b074 100644
--- a/settings/setup-clojure-mode.el
+++ b/settings/setup-clojure-mode.el
@@ -5,7 +5,4 @@
 (add-hook 'clojure-mode-hook 'enable-paredit-mode)
 (add-hook 'clojure-mode-hook 'prettify-symbols-mode)
 
-;; This should be in it's own setup file
-(add-to-list 'auto-mode-alist '("\\.el\\'" . paredit-mode))
-
 (provide 'setup-clojure-mode)
diff --git a/settings/setup-haskell-mode.el b/settings/setup-haskell-mode.el
index 435387a..ea3f1f9 100644
--- a/settings/setup-haskell-mode.el
+++ b/settings/setup-haskell-mode.el
@@ -1,4 +1,6 @@
 (require 'haskell-mode)
 (require 'flycheck-haskell)
 
+(setq inferior-haskell-find-project-root nil)
+
 (provide 'setup-haskell-mode)
diff --git a/settings/setup-ido.el b/settings/setup-ido.el
index 6805260..f10e9fc 100644
--- a/settings/setup-ido.el
+++ b/settings/setup-ido.el
@@ -20,7 +20,6 @@
 (defun my/ido-go-straight-home ()
   (interactive)
   (cond
-   ((looking-back "~/") (insert "projects/"))
    ((looking-back "/") (insert "~/"))
    (:else (call-interactively 'self-insert-command))))
 
diff --git a/settings/setup-multiple-cursors.el b/settings/setup-multiple-cursors.el
index 16852f6..4dfcdc4 100644
--- a/settings/setup-multiple-cursors.el
+++ b/settings/setup-multiple-cursors.el
@@ -1,5 +1,5 @@
-(global-set-key (kbd "C-c <up>") 'mc/edit-lines)
-(global-set-key (kbd "C-c <down>") 'mc/mark-all-like-this)
+(global-set-key (kbd "C-c <C-up>") 'mc/edit-lines)
+(global-set-key (kbd "C-c <C-down>") 'mc/mark-all-like-this)
 (global-set-key (kbd "C-c <C-right>") 'mc/mark-next-like-this)
 (global-set-key (kbd "C-c <C-left>") 'mc/mark-previous-like-this)
 (global-set-key (kbd "M-s m") 'mc/mark-all-in-eval)
diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el
index b3893cf..92cfec2 100644
--- a/settings/setup-web-mode.el
+++ b/settings/setup-web-mode.el
@@ -2,7 +2,8 @@
 
 
 (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
diff --git a/settings/setup-yasnippet.el b/settings/setup-yasnippet.el
index fd27543..4145574 100644
--- a/settings/setup-yasnippet.el
+++ b/settings/setup-yasnippet.el
@@ -3,7 +3,13 @@
 (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
 (yas-global-mode 1)
 
+(define-key yas-minor-mode-map [(tab)] nil)
+(define-key yas-minor-mode-map (kbd "TAB") nil)
+
 ;; Jump to end of snippet definition
 (define-key yas-keymap (kbd "<return>") 'yas-exit-all-snippets)
 
+(add-hook 'term-mode-hook (lambda()
+			    (setq yas-dont-activate t)))
+
 (provide 'setup-yasnippet)