diff --git a/.vimrc b/.vimrc
index 9a0393d..fb29fdd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -29,6 +29,9 @@ Plugin 'vim-syntastic/syntastic'
 " pep8 checking
 Plugin 'nvie/vim-flake8'
 
+" jedi-vim
+Plugin 'davidhalter/jedi-vim'
+
 " winresizer
 Plugin 'simeji/winresizer'
 
@@ -80,6 +83,7 @@ set visualbell
 set virtualedit=block
 set scrolloff=1
 set wildmenu
+set term=screen-256color
 
 " tabs and line wrap
 set tabstop=4
@@ -131,6 +135,11 @@ map <leader>n :NERDTreeToggle<CR>
 
 " ctrl-p setup
 let g:ctrlp_working_path_mode = 'ra'
+let g:ctrlp_custom_ignore = {
+  \ 'dir':  '\v[\/](\.(git|hg|svn))?(venv)?$',
+  \ 'file': '\v\.(exe|so|dll)$',
+  \ 'link': 'some_bad_symbolic_links',
+  \ }
 
 " see docstrings for folded code
 let g:SimpylFold_docstring_preview=1
diff --git a/setup.sh b/setup.sh
index c678172..ad2cadb 100644
--- a/setup.sh
+++ b/setup.sh
@@ -4,11 +4,13 @@
 rm -f ~/.zshrc
 rm -f ~/.vimrc
 rm -rf ~/.vim
+rm -f ~/.tmux.conf
 
 # create symbolic links to dotfiles
 ln -s ~/.dotfiles/.vimrc ~/.vimrc 
 ln -s ~/.dotfiles/.zshrc ~/.zshrc 
 ln -s ~/.dotfiles/.vim ~/.vim 
+ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf
 
 # install vundle
 git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
diff --git a/tmux.conf b/tmux.conf
new file mode 100644
index 0000000..f14f680
--- /dev/null
+++ b/tmux.conf
@@ -0,0 +1,40 @@
+#### COLOUR (Solarized dark)
+
+# set vi keys
+set-window-option -g mode-keys vi
+
+# default statusbar colors
+set-option -g status-bg black #base02
+set-option -g status-fg yellow #yellow
+set-option -g status-attr default
+
+# default window title colors
+set-window-option -g window-status-fg brightblue #base0
+set-window-option -g window-status-bg default
+#set-window-option -g window-status-attr dim
+
+# active window title colors
+set-window-option -g window-status-current-fg brightred #orange
+set-window-option -g window-status-current-bg default
+#set-window-option -g window-status-current-attr bright
+
+# pane border
+set-option -g pane-border-fg black #base02
+set-option -g pane-active-border-fg brightgreen #base01
+
+# message text
+set-option -g message-bg black #base02
+set-option -g message-fg brightred #orange
+
+# pane number display
+set-option -g display-panes-active-colour blue #blue
+set-option -g display-panes-colour brightred #orange
+
+# clock
+set-window-option -g clock-mode-colour green #green
+
+# bell
+set-window-option -g window-status-bell-style fg=black,bg=red #base02, red
+
+# term color
+set -g default-terminal "screen-256color"