diff --git a/.gitmodules b/.gitmodules
index b9e7126..aa6589e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,9 @@
 [submodule "bundle/gundu.vim"]
 	path = bundle/gundu.vim
 	url = https://github.com/sjl/gundo.vim.git
+[submodule "bundle/vim-coffee-script"]
+	path = bundle/vim-coffee-script
+	url = https://github.com/kchmck/vim-coffee-script.git
+[submodule "bundle/vim-golang"]
+	path = bundle/vim-golang
+	url = https://github.com/jnwhiteh/vim-golang.git
diff --git a/.vimrc b/.vimrc
index db781da..d77147f 100755
--- a/.vimrc
+++ b/.vimrc
@@ -1,4 +1,5 @@
 set t_Co=256
+set vb
 
 call pathogen#infect()
 set nocompatible
@@ -32,7 +33,7 @@ set expandtab
 " \d will hide/show
 " \b will enter :NERDTreeFromBookmark and then
 " you can autocomplete the name of a bookmark
-map <leader>d :execute 'NERDTreeToggle ' . getcwd()<CR>
+nnoremap <leader>d :NERDTreeToggle<cr>
 map <leader>gu :GundoToggle<CR>
 let NERDTreeDirArrows=1
 let NERDTreeMinimalUI=1
@@ -132,7 +133,7 @@ function! DFW()
 endfunction
 
 let g:ctrlp_extensions = ['line']
-let g:ctrlp_user_command = 'mdfind -onlyin %s file'
+let g:ackprg = 'ag --nogroup --nocolor --column'
 
 " automatically open and close the popup menu / preview window
 au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a58fec6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,7 @@
+# .vim
+
+It's my `.vim`! Hooray. It changes often, but in general some notes:
+
+* Stuff uses Pathogen. Vundle still seems weird to me.
+* the_silver_searcher, jshint, pyflakes, git are required
+* I usually use this stuff with MacVim
diff --git a/bundle/vim-coffee-script b/bundle/vim-coffee-script
new file mode 160000
index 0000000..d6dcb9b
--- /dev/null
+++ b/bundle/vim-coffee-script
@@ -0,0 +1 @@
+Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
diff --git a/bundle/vim-css-color b/bundle/vim-css-color
new file mode 160000
index 0000000..417eaf8
--- /dev/null
+++ b/bundle/vim-css-color
@@ -0,0 +1 @@
+Subproject commit 417eaf8a20a6208e34ff167f5636b20f8f812ed8
diff --git a/bundle/vim-golang b/bundle/vim-golang
new file mode 160000
index 0000000..a606552
--- /dev/null
+++ b/bundle/vim-golang
@@ -0,0 +1 @@
+Subproject commit a6065526042591e67c0d460bdf06ad9e79f57b24