diff --git a/bash/.profile b/bash/.profile
index d57a60e..bdbb86d 100644
--- a/bash/.profile
+++ b/bash/.profile
@@ -26,5 +26,13 @@ fi
 export PATH=$PATH:~/.bin
 export TERM=xterm-256color
 
-[ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion
+# Installed with https://github.com/pyenv/pyenv-installer
+export PATH="/home/nicholas/.pyenv/bin:$PATH"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+if [ -f /usr/local/etc/bash_completion ]
+then
+    . /usr/local/etc/bash_completion
+fi
 
diff --git a/config.sh b/config.sh
index fc0f38a..7fadf02 100755
--- a/config.sh
+++ b/config.sh
@@ -4,17 +4,5 @@ stow -t ~ bash
 stow -t ~ screen
 stow -t ~ vim
 stow -t ~ slate
-
-#rm -f .screenrc
-#ln -s ~/Code/config/screenrc .screenrc
-
-#rm -f .vimrc
-#ln -s ~/Code/config/vimrc .vimrc
-
-# set up the default branch for git
-#git config --global branch.master.remote origin
-#git config --global branch.master.merge refs/heads/master
-
-#mkdir -f ~/.vim
-#git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+stow -t ~ tmux
 
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
new file mode 100644
index 0000000..b2b0326
--- /dev/null
+++ b/tmux/.tmux.conf
@@ -0,0 +1,53 @@
+# Reload tmux config
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
+
+set -sg escape-time 0
+
+set -g default-terminal "screen-256color"
+
+# window status
+setw -g window-status-format "#[fg=colour7]#[bg=black] --#[fg=color7]#[bg=black] #I #W "
+setw -g window-status-current-format "#[bg=colour7]#[fg=black] --#[bg=color7]#[fg=black] #I #W "
+
+# The statusbar
+set -g status-interval 2
+set -g status-position bottom
+set -g status-bg colour234
+set -g status-fg colour137
+set -g status-attr dim
+set -g status-left ''
+set -g status-right '#[fg=colour233,bg=colour241,bold] %m/%d #[fg=colour233,bg=colour245,bold] %I:%M '
+set -g status-right-length 50
+set -g status-left-length 20
+set -g clock-mode-style 12
+
+# Vim style pane selection
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# Use Alt-vim keys without prefix key to switch panes
+bind -n M-h select-pane -L
+bind -n M-j select-pane -D
+bind -n M-k select-pane -U
+bind -n M-l select-pane -R
+
+# Use Alt-arrow keys without prefix key to switch panes
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+# Window splitting
+bind-key c new-window -c "#{pane_current_path}"
+bind-key v split-window -h -c "#{pane_current_path}"
+bind-key h split-window -v -c "#{pane_current_path}"
+bind-key + select-layout even-vertical
+bind-key = select-layout even-horizontal
+
+bind-key -n C-S-Down resize-pane -D 5
+bind-key -n C-S-Up resize-pane -U 5
+bind-key -n C-S-Left resize-pane -L 5
+bind-key -n C-S-Right resize-pane -R 5
+
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index b5a1e7c..d8e4e25 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -34,7 +34,7 @@ SetupTabbing
 " makes LaTeX use spell checking, word wrapping
 autocmd FileType tex set wrap spell
 autocmd FileType make set noexpandtab
-autocmd FileType python SetupTabbing
+"autocmd FileType python SetupTabbing
 autocmd FileType markdown set wrap
 
 let java_allow_cpp_keywords=1