From 655327f069b3621662a3bd2e6fb9d6c42eac32ac Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 13 Aug 2014 01:17:39 -0400
Subject: [PATCH] Add tmux controls to vimrc

---
 bashrc |  4 ----
 vimrc  | 10 ++++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bashrc b/bashrc
index 5ebbfb65..5eb14fb5 100644
--- a/bashrc
+++ b/bashrc
@@ -1,7 +1,3 @@
 # Source component rcfiles
-source ~/.zsh/paths
 # source ~/.zsh/functions
 # source ~/.zsh/aliases
-
-# Load RVM into a shell session *as a function*
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" 
diff --git a/vimrc b/vimrc
index c0e29a93..7aa2454d 100644
--- a/vimrc
+++ b/vimrc
@@ -175,6 +175,8 @@ NeoBundleFetch 'Shougo/neobundle.vim'
 
         " Project-wide search and replace
         " NeoBundle 'skwp/greplace.vim'
+        
+        NeoBundle 'christoomey/vim-tmux-navigator'
 
         " Netrw improvements
         NeoBundle 'scrooloose/nerdtree'
@@ -303,10 +305,10 @@ NeoBundleFetch 'Shougo/neobundle.vim'
         " % matchit shortcut, but only in normal mode!
         nmap <Tab> %
         " Easier fold toggle
-        nnoremap <C-j> 5j 
-        vnoremap <C-j> 5j 
-        nnoremap <C-k> 5k
-        vnoremap <C-k> 5k
+        nnoremap <M-j> 5j
+        vnoremap <M-j> 5j
+        nnoremap <M-k> 5k
+        vnoremap <M-k> 5k
 
         " f: Find. Also support repeating with .
         nnoremap <Plug>OriginalSemicolon ;