diff --git a/bash/aliases b/bash/aliases
index 36744ca..f4a65ff 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -1,4 +1,4 @@
-extract () 
+extract ()
 {
     if [ -f $1 ] ; then
         case $1 in
@@ -20,6 +20,8 @@ extract ()
     fi
 }
 
+bopen() { cd `bundle show "${1}"` && vim; }  
+
 pman() { man -t "${1}" | open -f -a /Applications/Preview.app; }
 
 # http://www.macosxhints.com/article.php?story=20060502160527780&query=terminal%2Btitle
@@ -42,6 +44,7 @@ cdf()
     cd "$currFolderPath"
 }
 
+
 # cd
 alias ..='cd ..'
 
@@ -72,4 +75,7 @@ alias techbelly='ssh beerscope@www.techbelly.com'
 
 alias lsock='sudo /usr/sbin/lsof -i -P'
 
+alias sshwm='ssh -F ~/.ssh/wmob_config'
+alias scpwm='scp -F ~/.ssh/wmob_config'
+
 alias dsrm="find . -type f -name .DS_Store -print0 | xargs -0 rm"
diff --git a/bash/paths b/bash/paths
index c639331..b39a602 100644
--- a/bash/paths
+++ b/bash/paths
@@ -21,12 +21,10 @@ if [ -d $GIT_HOME ]; then
   export MANPATH=$MANPATH:$GIT_HOME/man
 fi
 
+export ANDROID_SDK_ROOT=/usr/local/Cellar/android-sdk/r16
 
-if [ -d ~/android-sdk ]; then
-	export PATH=$PATH:$HOME/android-sdk/tools
-fi
-
+export NODE_PATH=$NODE_PATH:/usr/local/lib/node_modules
 
 if [ -d ~/appengine-java-sdk ]; then
 	export PATH=$PATH:$HOME/appengine-java-sdk/bin
-fi
\ No newline at end of file
+fi
diff --git a/gitconfig b/gitconfig
index 2ea47f1..df757ae 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,5 +22,3 @@
 	diff = auto
 	interactive = auto
 	status = auto
-[merge]
-	tool = mvimdiff
diff --git a/profile b/profile
index 03d5537..9b47a90 100755
--- a/profile
+++ b/profile
@@ -14,4 +14,5 @@ fi
 
 if [ -f ~/.rvm/scripts/rvm ]; then 
     . ~/.rvm/scripts/rvm
-fi
\ No newline at end of file
+fi
+[[ -s "/Users/ben/.rvm/scripts/rvm" ]] && source "/Users/ben/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
diff --git a/vim/bundles.vim b/vim/bundles.vim
index 30a1815..a6a3ebe 100644
--- a/vim/bundles.vim
+++ b/vim/bundles.vim
@@ -17,6 +17,7 @@ Bundle "tpope/vim-surround"
 Bundle "Lokaltog/vim-easymotion"    
 Bundle "tpope/vim-git"
 Bundle "tpope/vim-rvm"
+Bundle "tpope/vim-endwise"
 Bundle "ujihisa/vim-markdown"
 Bundle "timcharper/textile.vim"
 Bundle "altercation/vim-colors-solarized"
@@ -26,6 +27,7 @@ Bundle "git://git.wincent.com/command-t.git"
 Bundle "vimwiki"
 Bundle 'vividchalk.vim'
 Bundle 'Tabular'
+Bundle 'go.vim'
 
 Bundle 'Conque-Shell'
 Bundle 'bufexplorer.zip'
diff --git a/vimrc b/vimrc
index f7f44cf..407f44f 100644
--- a/vimrc
+++ b/vimrc
@@ -52,7 +52,7 @@ set background=light
 set pastetoggle=<F2>
 
 let mapleader = ","
-
+nnoremap \ ,
 set showmatch
 
 set encoding=utf-8
@@ -67,6 +67,8 @@ set tabstop=2
 set softtabstop=2
 set smarttab
 
+set clipboard=unnamed
+
 syntax on
 
 augroup BgHighlight
@@ -143,8 +145,9 @@ noremap <space> /
 noremap <c-space> ?
 
 nnoremap <leader><space> :noh<cr>
-nnoremap <tab> %
-vnoremap <tab> %
+
+map ; :
+noremap ;; ;
 
 nnoremap <silent> <leader>ev <C-w><C-v><C-l>:e $MYVIMRC<cr>
 nnoremap <silent> <leader>eb <C-w><C-v><C-l>:e $HOME/.vim/bundles.vim<cr>
@@ -168,7 +171,6 @@ vnoremap <D-]> >gv
 nnoremap <leader>sc mqA;<esc>`q
 
 nnoremap <leader><leader> <C-^>
-
 " }}}
 
 " Rails shortcuts {{{
@@ -211,7 +213,7 @@ au BufNewFile,BufRead *.json set ft=javascript
 au BufRead,BufNewFile *.json set filetype=json foldmethod=syntax
 au FileType json command -range=% -nargs=* Tidy <line1>,<line2>! json_xs -f json -t json-pretty
 " }}}
-
+au BufRead,BufNewFile *.go set filetype=go
 
 so $HOME/.local.vim