=== removed directory 'vim/ftplugin'
=== removed file 'vim/ftplugin/ocaml.vim'
--- vim/ftplugin/ocaml.vim	2014-08-17 21:04:06 +0000
+++ vim/ftplugin/ocaml.vim	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-nnoremap <buffer> <localleader>g :GrowEnclosing<CR>
-nnoremap <buffer> <localleader>s :ShrinkEnclosing<CR>
-nnoremap <buffer> <C-]> :Locate<CR>

=== modified file 'vim/plugin/rc_merlin.vim'
--- vim/plugin/rc_merlin.vim	2014-08-17 21:04:06 +0000
+++ vim/plugin/rc_merlin.vim	2014-07-12 16:09:45 +0000
@@ -5,8 +5,3 @@
 runtime plugin/merlin.vim
 
 let g:syntastic_ocaml_checkers = ['merlin']
-
-if !exists('g:neocomplcache_force_omni_patterns')
-  let g:neocomplcache_force_omni_patterns = {}
-endif
-let g:neocomplcache_force_omni_patterns.ocaml = '[^. *\t]\.\w*\|\h\w*|#'