diff --git a/files/vimrc b/files/vimrc
index dddb25f..d2f1939 100644
--- a/files/vimrc
+++ b/files/vimrc
@@ -21,10 +21,8 @@ Plug 'majutsushi/tagbar'
 " Github repos of the user 'vim-scripts'
 " => can omit the username part for some plugins
 Plug 'Raimondi/delimitMate'
-Plug 'ctrlp.vim'
 Plug 'ervandew/supertab'
 Plug 'fisadev/FixedTaskList.vim'
-Plug 'fisadev/vim-ctrlp-cmdpalette'
 Plug 'fatih/vim-go'
 Plug 'https://github.com/scrooloose/nerdtree.git', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] }
 Plug 'https://github.com/tpope/vim-fugitive.git'
@@ -37,9 +35,13 @@ Plug 'vim-airline'
 Plug 'nathanaelkane/vim-indent-guides'
 Plug 'leafgarland/typescript-vim'
 Plug 'guns/xterm-color-table.vim'
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
+Plug 'mhinz/vim-hugefile'
+Plug 'darfink/vim-plist'
 
 " This one is sort of large, so disabling unless I really need it.
-" Plug 'klen/python-mode'
+Plug 'klen/python-mode'
 
 " non github repos
 " Plug 'git://git.wincent.com/command-t.git'
@@ -70,6 +72,7 @@ set background=dark
 " The following are commented out as they cause vim to behave a lot
 " differently from regular Vi. They are highly recommended though.
 "set showcmd		" Show (partial) command in status line.
+set laststatus=2
 set showmatch		" Show matching brackets.
 set ignorecase		" Do case insensitive matching
 set smartcase		" Do smart case matching
@@ -143,22 +146,26 @@ let mapleader = ","
 
 nmap <silent> <Leader>. :LustyJuggler<CR>
 let g:LustyJugglerKeyboardLayout = "dvorak"
+let g:LustyJugglerSuppressRubyWarning = 1
 
 nnoremap <silent> <Leader>/ :nohlsearch<CR>
 
 nnoremap <Leader>q :Bdelete!<CR>
 
-"====[ Enable ctrlp settings ]=============================
+"====[ ctrlp replacement settings ]========================
 
 augroup ctrlp
 	autocmd!
 
-	let g:ctrlp_map='<Leader>p'
-	let g:ctrlp_working_path_mode=''
-	let g:ctrlp_cmd = 'CtrlPMixed'
+	nnoremap ' :ls<cr>:b
+	nnoremap <BS> <C-^>
 
-	set wildignore+=*/tmp/*,*.so,*.swp,*.zip
-	let g:ctrlp_user_command="find %s ! -wholename '*/.git/*' ! -wholename '*/node_modules/*' ! -wholename '*/report/*' -type f"
+	set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*/node_modules/*,*/vendor/*
+
+	if executable('ack')
+		set grepprg=ack\ -s\ -H\ --nogroup\ --nocolor\ --column
+		set grepformat=%f:%l:%c:%m,%f:%l:%m
+	endif
 augroup END
 
 "====[ Set syntastic options ]=============================
@@ -177,6 +184,9 @@ let g:syntastic_loc_list_height=6
 
 let g:syntastic_cpp_checkers = ['clang_checker -std=c++1y']
 let g:syntastic_stl_format = '[%E{Err: %fe #%e}%B{, }%W{Warn: %fw #%w}]'
+ 
+let g:syntastic_go_checkers = ['govet', 'errcheck']
+"let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
 
 "====[ Set JavaScript options ]============================
 
@@ -209,6 +219,8 @@ augroup golang
 	" autocmd FileType go autocmd BufWritePre <buffer> Fmt
 	let g:go_disable_autoinstall = 1
 	let g:go_fmt_command = 'goimports'
+	au FileType go setlocal foldmethod=syntax
+	au FileType go setlocal foldlevel=99
 augroup END
 
 "====[ Set NERDTree options ]==============================
@@ -275,13 +287,13 @@ vmap <expr> D DVB_Duplicate()
 
 "====[ Python settings ]==================================
 
-let g:pymode_indent = 0
+let g:pymode_indent = 1
 let g:pymode_rope = 0
 let g:pymode_folding = 0
 let g:pymode_lint_ignore = "W191,E251,E203,E221,E126,E128"
 let NERDTreeIgnore=['.pyc$']
 let g:pymode_doc = 0
-au FileType python set noexpandtab
+au FileType python set expandtab
 au FileType python set tabstop=4
 
 "====[ General Text Editing settings ]====================
@@ -310,3 +322,14 @@ autocmd BufNewFile,BufRead *.ts set ft=typescript
 let g:typescript_compiler_options = " -t ES5 -m commonjs"
 let g:syntastic_typescript_tsc_args = "-t ES5 -m commonjs"
 
+"====[ UltiSnips ]========================================
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" If you want :UltiSnipsEdit to split your window.
+let g:UltiSnipsEditSplit="vertical"
+
+"====[ Nice Commands ]====================================
+command! -bang -nargs=* -bar Make silent w | silent make <args> | unsilent redraw! | cwindow
+command! -bang -nargs=* -complete=file -bar Grep silent! grep! <args> | unsilent redraw! | cwindow