--- a/haskell-init.el	Mon Oct 15 20:31:39 2012 -0500
+++ b/haskell-init.el	Sat Jun 22 22:54:53 2013 -0500
@@ -1,8 +1,14 @@
 ;; ~/.emacs.d/haskell-init.el
 ;; Luke Hoersten <[email protected]>
 
-(add-to-list 'load-path "~/.emacs.d/thirdparty/haskell-mode") ; override haskell mode on system
-(load "haskell-site-file")
+(add-to-list 'load-path "~/.emacs.d/thirdparty/haskell-mode/")
+(require 'haskell-mode-autoloads)
+
+;; (add-to-list 'load-path "~/.emacs.d/thirdparty/haskell-mode") ; override haskell mode on system
+;;(add-to-list 'load-path "~/.cabal/share/ghc-mod-2.0.2") ; load ghc-mod from cabal
+;; (autoload 'ghc-init "~/.emacs.d/thirdparty/ghc-mod-2.0.2/ghc" nil t)
+
+;; (load "haskell-site-file")
 
 ;; ;; scion
 ;; (if (file-exists-p "~/.cabal/share/scion-0.3/emacs/scion.el")
@@ -20,12 +26,12 @@
 (add-hook
  'haskell-mode-hook
  (lambda ()
+   ;; (ghc-init)
    (turn-on-haskell-indent)
    (capitalized-words-mode)
    (turn-on-haskell-doc-mode)
    (turn-on-haskell-decl-scan)
    (imenu-add-menubar-index)
-   (local-set-key (kbd "C-x C-s") 'haskell-mode-save-buffer)
    (setq
     haskell-font-lock-haddock t
     haskell-stylish-on-save t

--- a/init.el	Mon Oct 15 20:31:39 2012 -0500
+++ b/init.el	Sat Jun 22 22:54:53 2013 -0500
@@ -34,6 +34,7 @@
 (global-font-lock-mode t)                 ; syntax highlighting
 (global-set-key (kbd "C-c c") 'compile)   ; compile
 (global-set-key (kbd "C-c r") 'recompile) ; recompile
+(subword-mode t)                          ; move by camelCase words
 
 
 ;;; Darwin
@@ -66,17 +67,16 @@
   (setenv "TERM" "emacs") ; enable colors
   (setenv "ODBCSYSINI" "/home/lhoersten/myodbc")
   (setenv "ODBCINI" "/home/lhoersten/myodbc/odbc.ini")
-  (setenv "PATH" (concat "/usr/local/bin:" "~/.cabal/bin:" (getenv "PATH"))))
+  (setenv "PATH" (concat "/usr/local/bin:" (getenv "HOME") "/.cabal/bin:" (getenv "PATH"))))
 (add-hook 'eshell-mode-hook 'setup-env)
-
 (setup-env)
 (eshell)
 
 ;;;; Mode-Specific ;;;;
 
 ;;; text-mode
-(add-hook 'text-mode-hook 'flyspell-mode t)             ; spellcheck text
-(add-hook 'text-mode-hook 'turn-on-auto-fill)           ; autofill text
+(add-hook 'fundamental-mode-hook 'flyspell-mode t)             ; spellcheck text
+(add-hook 'fundamental-mode-hook 'turn-on-auto-fill)           ; autofill text
 
 ;;; ido-mode
 (ido-mode t)                                            ; file/buffer selector
@@ -136,8 +136,6 @@
 (require 'c-init)             ; c specific elisp
 (require 'haskell-init)       ; haskell specific elisp
 (require 'color-theme-init)   ; color theme specific elisp
-(require 'vala-mode)          ; vala programming language
-(require 'clojure-mode)       ; clojure programming language
 (require 'rainbow-delimiters) ; multi-colored parens
 
 ;;; function init
@@ -148,9 +146,10 @@
 ;;; yasnippets
 (add-to-list 'load-path "~/.emacs.d/thirdparty/yasnippet")
 (require 'yasnippet)
-(yas/initialize)
-(yas/load-directory "~/.emacs.d/thirdparty/yasnippet/snippets")
-(setq-default yas/prompt-functions '(yas/ido-prompt yas/dropdown-prompt)) ; use ido for multiple snippets
+(setq-default yas-prompt-functions '(yas-ido-prompt yas-dropdown-prompt)) ; use ido for multiple snippets
+(setq-default yas-snippet-dirs '("~/.emacs.d/thirdparty/yasnippet/snippets"
+                                 "~/.emacs.d/thirdparty/snippets"))
+(yas-global-mode t)
 
 ;;; java-mode
 (add-hook 'java-mode-hook (lambda () (setq whitespace-line-column 140)))

--- a/thirdparty/clojure-mode.el	Mon Oct 15 20:31:39 2012 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1199 +0,0 @@
-;;; clojure-mode.el --- Major mode for Clojure code
-
-;; Copyright (C) 2007-2011 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
-;;
-;; Authors: Jeffrey Chu <[email protected]>
-;;          Lennart Staflin <[email protected]>
-;;          Phil Hagelberg <[email protected]>
-;; URL: http://github.com/technomancy/clojure-mode
-;; Version: 1.11.5
-;; Keywords: languages, lisp
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; Provides font-lock, indentation, and navigation for the Clojure