From da2a736c7ab880e9c26d6febc0f64df8522f0f59 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Mon, 14 Jan 2013 21:13:20 -0600
Subject: [PATCH] Adding Haskell mode, commenting out neocomplcache for now,
 removing Clam and Gundo

---
 vimrc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/vimrc b/vimrc
index b95e15a..f41121b 100644
--- a/vimrc
+++ b/vimrc
@@ -28,15 +28,12 @@ Bundle 'scrooloose/nerdcommenter'
 " Bundle 'scrooloose/nerdtree'
 Bundle 'altercation/vim-colors-solarized'
 " Bundle 'ervandew/supertab'
-" Bundle 'sjl/gundo'
-" Bundle 'sjl/clam'
 Bundle 'kien/ctrlp.vim'
 Bundle 'gregsexton/MatchTag'
 " Bundle 'closetag'
 Bundle 'kana/vim-smartinput'
 Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
 Bundle 'mbbill/undotree'
-Bundle 'Shougo/neocomplcache'
 Bundle 'coderifous/textobj-word-column.vim'
 " Bundle 'myusuf3/numbers'
 Bundle 'benmills/vimux'
@@ -47,6 +44,8 @@ Bundle 'kshenoy/vim-signature'
 "Bundle 'SirVer/ultisnips'
 Bundle 'fmoralesc/vim-pad'
 Bundle 'lukerandall/haskellmode-vim'
+Bundle 'Shougo/neocomplcache'
+Bundle 'ujihisa/neco-ghc'
 
 filetype plugin indent on " last Vundle requirement
 
@@ -229,4 +228,7 @@ let g:haddock_browser = "open"
 let g:haddock_browser_callformat = "%s %s"
 
 " NeoComplCache
-let g:neocomplcache_enable_at_startup = 1
+" let g:neocomplcache_enable_at_startup = 1
+
+" Undotree
+nnoremap <leader>u :UndotreeToggle<cr>