diff --git a/.gitignore b/.gitignore
index 36a1275..f468ba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ nosetests.xml
 # Dotfiles
 /vim/vim/.netrwhist
 /vim/vim/vimpyre/*
+/vim/vim/plugged
+.DS_Store
diff --git a/scripts/tmux.py b/scripts/tmux.py
index b1fffed..3cc70b3 100755
--- a/scripts/tmux.py
+++ b/scripts/tmux.py
@@ -2,10 +2,10 @@
 import os
 import subprocess
 
-print "TMUX: %s" % os.getenv("TMUX", "")
-print "SSH_TTY: %s" % os.getenv("SSH_TTY", "")
-print "SSH_AUTH_SOCK: %s" % os.getenv("SSH_AUTH_SOCK", "")
-print "HOME: %s" % os.getenv("HOME", "")
+print("TMUX: %s" % os.getenv("TMUX", ""))
+print("SSH_TTY: %s" % os.getenv("SSH_TTY", ""))
+print("SSH_AUTH_SOCK: %s" % os.getenv("SSH_AUTH_SOCK", ""))
+print("HOME: %s" % os.getenv("HOME", ""))
 
 if os.getenv("TMUX") is None:
     if os.getenv("SSH_TTY") is not None:
@@ -19,10 +19,10 @@ if os.getenv("TMUX") is None:
             os.symlink(os.getenv("SSH_AUTH_SOCK"), sock_file)
             os.environ['SSH_AUTH_SOCK'] = sock_file
 
-        try:
-            subprocess.check_call(["tmux", "attach-session", "-t", "sshwrap"])
-        except subprocess.CalledProcessError:
-            print "lets create session"
-            os.environ['STY'] = "tmux-sshwrap"
-            os.execlpe("tmux", "tmux", "new-session", "-s", "sshwrap",
-                       os.environ)
+    try:
+        subprocess.check_call(["tmux", "attach-session", "-t", "sshwrap"])
+    except subprocess.CalledProcessError:
+        print("lets create session")
+        os.environ['STY'] = "tmux-sshwrap"
+        os.execlpe("tmux", "tmux", "new-session", "-s", "sshwrap",
+                   os.environ)
diff --git a/vim/vimrc b/vim/vimrc
index 31fcf7d..b6387a2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -8,15 +8,23 @@ Plug 'tpope/vim-surround'
 Plug 'mileszs/ack.vim'
 Plug 'xolox/vim-misc'
 Plug 'xolox/vim-notes'
+Plug 'scrooloose/nerdtree'
+Plug 'jistr/vim-nerdtree-tabs'
+Plug 'mkitt/tabline.vim'
+Plug 'majutsushi/tagbar'
+Plug 'bling/vim-airline'
+Plug 'pangloss/vim-javascript'
+Plug 'mxw/vim-jsx'
 
 " On-demand
-Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 Plug 'bufexplorer.zip', { 'on':  'BufExplorer' }
 Plug 'kien/ctrlp.vim', { 'on':  'CtrlP' }
+Plug 'airblade/vim-gitgutter', { 'on': 'GitGutterToggle' }
 
 call plug#end()
 
 " BMS =========================================================================
+let g:Powerline_symbols='fancy'
 
 set hidden      " Hides buffers instead of closing
 set nowrap      " don't wrap lines
@@ -57,16 +65,34 @@ set complete-=i
 set shortmess=at
 set cmdheight=2
 
+" Show the status line always
+set laststatus=2
+
 " Toggle column numbers
 set relativenumber
 nmap <silent> <C-n> :set invrelativenumber<CR>
 
+" Go to tab by number
+noremap <leader>1 1gt
+noremap <leader>2 2gt
+noremap <leader>3 3gt
+noremap <leader>4 4gt
+noremap <leader>5 5gt
+noremap <leader>6 6gt
+noremap <leader>7 7gt
+noremap <leader>8 8gt
+noremap <leader>9 9gt
+noremap <leader>0 :tablast<cr>
+
 nmap <silent> <Leader>h :nohlsearch<CR>
 nmap <silent> <Leader>b :BufExplorer<CR>
+nmap <F8> :TagbarToggle<CR>
+nmap <F9> :GitGutterToggle<CR>
 
 iabbrev ipdb import ipdb; ipdb.set_trace()
 
-nnoremap <M-Space> :NERDTreeToggle<cr>
+" nnoremap <M-Space> :NERDTreeToggle<cr>
+nnoremap <M-Space> :NERDTreeTabsToggle<cr>
 
 map <C-h> <C-w>h
 map <C-j> <C-w>j
@@ -80,7 +106,7 @@ vnoremap <silent> <Leader>q[ di[<ESC>pa]<ESC>
 
 vnoremap <silent> <Leader>q{ di{<ESC>pa}<ESC>
 
-set bg=light
+set bg=dark
 colorscheme solarized
 
 let g:ctrlp_map = '<F3>'
@@ -89,3 +115,9 @@ let g:ctrlp_cmd = 'CtrlP'
 let g:bufExplorerSortBy='fullpath'
 let g:bufExplorerSplitOutPathName=0
 let g:bufExplorerShowRelativePath=1
+
+autocmd Filetype html setlocal ts=2 sw=2 sts=2 expandtab
+autocmd Filetype htmldjango setlocal ts=2 sw=2 sts=2 expandtab
+autocmd Filetype python setlocal ts=4 sw=4 sts=4 expandtab
+autocmd Filetype javascript setlocal ts=2 sw=2 sts=2 expandtab
+autocmd Filetype javascript.jsx setlocal ts=2 sw=2 sts=2 expandtab