diff --git a/.brew b/.brew
index fc2be2edf59..5a1f32d6fdb 100755
--- a/.brew
+++ b/.brew
@@ -32,9 +32,13 @@ brew install ack
 brew install git
 brew install imagemagick
 brew install lynx
+brew install macvim
 brew install mysql
 brew install node
+brew install rbenv --HEAD
+brew install ruby-build
 brew install rename
+brew install the_silver_searcher
 brew install tree
 
 # Ridiculous Fish Shell
@@ -66,6 +70,7 @@ installcask rdio
 installcask seil
 installcask sketch
 installcask sketch-toolbox
+installcask slack
 installcask steam
 installcask sublime-text
 installcask the-unarchiver
diff --git a/.vimrc b/.vimrc
index 4be7128573f..83d98a624b4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -35,7 +35,10 @@ Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-haml'
 
 " quick file switcher
-Plugin 'wincent/Command-T'
+Plugin 'kien/ctrlp.vim'
+let g:ctrlp_map = '<leader>t'
+let g:ctrlp_working_path_mode = 'a'
+let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'
 set wildignore+=node_modules/**
 set wildignore+=bower_components/**
 
@@ -67,9 +70,7 @@ Plugin 'tpope/vim-dispatch'
 " BEAUTIFUL COLORZ
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'Lokaltog/vim-distinguished'
-
-" BEAUTIFUL POWERLINE
-" Plugin 'Lokaltog/vim-powerline'
+Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 
 " Git gutter shows diffs on the left num bar!
 Plugin 'airblade/vim-gitgutter'
@@ -227,7 +228,7 @@ set shell=/bin/bash
 set guioptions-=T
 
 set background=dark
-colorscheme distinguished
+colorscheme grb256
 set encoding=utf8
 
 try
diff --git a/bootstrap.sh b/bootstrap.sh
index 5d8bb410922..59261b68892 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,8 +11,8 @@ function doIt() {
   sh .brew
 
   # install bundle and vim bundles
-  git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
-  vim -E -c BundleInstall -c q
+  git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+  vim -E -c PluginInstall -c q
 
   # install oh-my-fish
   curl -L https://github.com/bpinto/oh-my-fish/raw/master/tools/install.fish | fish