diff --git a/.vimrc b/.vimrc
index d5827cf..19e9d5f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -163,6 +163,13 @@ let g:ConqueTerm_InsertOnEnter = 0
 let g:ConqueTerm_SendVisKey = '<Leader>ss'
 
 " * MiniBufExplorer
+let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+let g:ycm_confirm_extra_conf = 0
+
+au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+au BufEnter *.org            call org#SetOrgFileType()
+
+"MiniBufExplore Options
 "let g:miniBufExplMapWindowNavVim = 1
 "let g:miniBufExplMapWindowNavArrows = 1
 "let g:miniBufExplMapCTabSwitchBufs = 1