diff --git a/configs/vimrc b/configs/vimrc
index aea166d..01ee30a 100644
--- a/configs/vimrc
+++ b/configs/vimrc
@@ -72,6 +72,7 @@ set fo=tcroq          " wrap with textwidth, wrap comments, insert commend leade
 set autoindent        " auto indent
 set smartindent       " smart identation
 set number
+set wim=longest,list  " file auto-completion
 
 let mapleader=","     " use comma to start user-defined (in plugins) functions
 
@@ -84,6 +85,10 @@ au FileType python set expandtab tabstop=4 shiftwidth=4 softtabstop=4 textwidth=
 " reStructured files follow python closely, but use 3 tab stops instead of 4
 au FileType rst set expandtab tabstop=3 sw=3 sts=3 textwidth=78
 
+" templates (Jinja2 in this case) will also have spaces instead of tabs and
+" follow most of the python standards (with the exception of the textwidth)
+au FileType htmldjango set expandtab tabstop=4 shiftwidth=4 softtabstop=4
+
 " the smarty filetypes doesn't have any sort of indentation, so we set it to
 " auto
 au FileType smarty set ai
@@ -155,14 +160,10 @@ else
 	imap <M-0> <ESC>:tabn 10<CR>a
 endif
 
-" file auto-completion
-set wim=longest,list
-
 " custom PHP syntax file configuration
 let php_smart_members=1
 
 " Vundle stuff starts here
-"filetype off
 set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
 
@@ -172,8 +173,11 @@ Bundle 'tpope/vim-commentary'
 Bundle 'godlygeek/tabular'
 Bundle 'jiangmiao/auto-pairs'
 Bundle 'nvie/vim-flake8'
-Bundle 'scrooloose/nerdtree'
-Bundle 'terryma/vim-multiple-cursors'
+" Bundle 'scrooloose/nerdtree'
+" Bundle 'terryma/vim-multiple-cursors'
+Bundle 'msanders/snipmate.vim'
+Bundle 'kien/ctrlp.vim'
+" Bundle 'Glench/Vim-Jinja2-Syntax'
 
 " powerline settings
 ""let g:Powerline_symbols = 'fancy'