Merge branch 'master' of https://bitbucket.org/vishap/scripts

vim/vimrc

@@ -496,6 +496,16 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     map <silent> ac :call CF5CompileOnly()<CR>
     map <silent> ar :call CF5CompileAndRun()<CR>
     
+    "
+    "   Provide templates
+    "
+    Plugin 'aperezdc/vim-template'
+    "let g:templates_no_autocmd = 1
+    let g:templates_no_builtin_templates = 1
+    "
+    "   Local vimrc
+    "
+    Plugin 'embear/vim-localvimrc'
 
     "
     "   Comment code.