diff --git a/tmux.conf b/tmux.conf
new file mode 100644
index 0000000..c55ae4b
--- /dev/null
+++ b/tmux.conf
@@ -0,0 +1,49 @@
+# use C-a as prefix, like screen does
+set -g prefix C-a
+unbind C-b
+
+# press C-a twice to send to current program
+bind C-a send-prefix
+
+# shorten delay time so vim is happy
+set -s escape-time 1
+
+# start counting from 1
+set -g base-index 1
+set -g pane-base-index 1
+
+# Reload key
+bind r source-file ~/.tmux.conf \; display "Reloaded!"
+
+# easy-to-remember window splitting
+bind | split-window -h
+bind - split-window -v
+
+bind h select-pane -L 
+bind j select-pane -D 
+bind k select-pane -U 
+bind l select-pane -R
+
+bind -r C-h select-window -t :-
+bind -r C-l select-window -t :+
+
+# resizing panes
+
+bind -r H resize-pane -L 5
+bind -r J resize-pane -D 5
+bind -r K resize-pane -U 5
+bind -r L resize-pane -R 5
+
+# mouse support
+
+setw -g mode-mouse on
+set -g mouse-select-pane on
+set -g mouse-resize-pane on
+
+# terminal support
+set -g default-terminal "screen-256color"
+
+set -g status off
+
+setw -g monitor-activity on
+set -g visual-activity on
diff --git a/vim/Rakefile b/vim/Rakefile
index 03e89c6..03fddae 100644
--- a/vim/Rakefile
+++ b/vim/Rakefile
@@ -15,8 +15,9 @@ namespace :vim do
 
     vim_dir = Pathname.new( ENV['HOME'] ) + '.vim' 
     bundle_home = vim_dir + 'bundle'
+    sh "rm -rf #{bundle_home}/vundle"
     sh "git clone http://github.com/gmarik/vundle.git #{bundle_home}/vundle"
-    sh "vim -u #{vim_dir}/bundles.vim +BundleInstall +q"
+    sh "vim -u #{vim_dir}/bundles.vim +BundleInstall +qa!"
      
 
   end # task :bundles