Merge branch 'master' into development

Author: Gaspar Chilingarov

autoload/vimide.vim

@@ -12,7 +12,9 @@ function! vimide#boot() " {{{
   if g:vimide_manage_folds | call vimide#setFoldsSettings() | endif
   if g:vimide_manage_restore | call vimide#setRestoreSettings() | endif
 
-  call vimide#elixir#boot()
+  if &filetype == 'elixir'
+    call vimide#elixir#boot()
+  endif
 
   if g:vimide_install_shortcuts | call vimide#setShortcuts() | endif
 endfunction " }}}

bundle/tagbar

@@ -1,22 +1,17 @@
-"
-" vim: et ts=2 sts=2 sw=2
-"
 
-let s:path = fnamemodify(resolve(expand('<sfile>:p')), ':h:h')
-let s:bundle_path = s:path."/bundle"
 
 if !exists('g:vimide_global_enable') | let g:vimide_global_enable = 0 | en
 if !exists('g:vimide_manage_indents') | let g:vimide_manage_indents = 1 | en
 if !exists('g:vimide_manage_search') | let g:vimide_manage_search = 1 | en
 if !exists('g:vimide_manage_completition') | let g:vimide_manage_completition = 1 | en
 
-if !exists('&undodir') 
+if !exists('&undodir')
   if !exists('g:vimide_manage_vimundo') | let g:vimide_manage_vimundo = 1 | en
 else
   let g:vimide_manage_vimundo = 0
 endif
 
-if !exists('&backupdir') 
+if !exists('&backupdir')
   if !exists('g:vimide_manage_vimbackup') | let g:vimide_manage_vimbackup = 1 | en
 else
   let g:vimide_manage_vimbackup = 0
@@ -28,3 +23,7 @@ if !exists('g:vimide_manage_restore') | let g:vimide_manage_restore = 1 | en
 if !exists('g:vimide_install_shortcuts') | let g:vimide_install_shortcuts = 1 | en
 
 if g:vimide_global_enable | call vimide#boot() | en
+
+"
+" vim: et ts=2 sts=2 sw=2
+"