diff --git a/.gitmodules b/.gitmodules
index 2d6abd4..301bc8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule ".vim/bundle/YouCompleteMe"]
 	path = .vim/bundle/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
+[submodule ".vim/bundle/ag"]
+	path = .vim/bundle/ag
+	url = https://github.com/rking/ag.vim
diff --git a/.vim/bundle/ag b/.vim/bundle/ag
new file mode 160000
index 0000000..f05f313
--- /dev/null
+++ b/.vim/bundle/ag
@@ -0,0 +1 @@
+Subproject commit f05f31352689be245611c893b37652110f27a2c5
diff --git a/.vimrc b/.vimrc
index 5648bfe..240826b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -168,7 +168,7 @@ if has("folding")
   endfun
   command! Tfdm call ToggleFoldmethod()
   set nofoldenable
-  set foldmethod=syntax
+  set foldmethod=manual
   set foldlevelstart=0 " Start with all folds closed
   "set foldclose=all " Close folds when cursor leaves them
 endif
@@ -1165,6 +1165,7 @@ Bundle 'hunner/vim-plist'
 Bundle 'vim-coffee-script'
 Bundle 'syntastic'
 Bundle 'YouCompleteMe'
+Bundle 'rking/ag'
 
 filetype plugin indent on
 " Brief help