diff --git a/bootstrap.json b/bootstrap.json
index 3e46ad25..460ebc09 100644
--- a/bootstrap.json
+++ b/bootstrap.json
@@ -9,32 +9,23 @@
         "brew linkapps"
     ],
     "casks": [
-        "bittorrent-sync",
         "dropbox",
         "emacs",
         "fabric",
         "firefox",
-        "flash",
         "flux",
         "ghc",
         "github-desktop",
         "gitup",
         "google-chrome",
         "google-hangouts",
-        "heroku-toolbelt",
         "hex-fiend",
-        "hipchat",
+        "hg",
         "imageoptim",
-        "iterm2",
-        "java",
         "lingon-x",
-        "litecoin",
-        "logitech-unifying",
         "max",
         "mou",
         "mplayerx",
-        "multibit",
-        "openemu",
         "pacifist",
         "peepopen",
         "postgres",
@@ -42,50 +33,32 @@
         "qlstephen",
         "reveal",
         "shrinkit",
-        "sketch",
         "spectacle",
         "steam",
         "sublime-text",
-        "superduper",
-        "torbrowser",
         "transmission",
-        "xact",
         "xquartz"
     ],
     "dependencies": {
-        "mit-scheme": "casks/xquartz"
+        "homebrew/x11/mit-scheme": "casks/xquartz"
     },
     "formulas": [
         "bash",
         "caskroom/cask/brew-cask",
-        "chromedriver",
         "cowsay",
-        "elasticsearch",
-        "ffmpeg",
         "fish",
-        "ghostscript",
-        "gibo",
         "git",
         "go",
-        "hub",
-        "imagemagick",
-        "libxml2",
-        "llvm",
         "macvim --overwrite-system-vi",
-        "mit-scheme",
+        "homebrew/x11/mit-scheme",
         "ncdu",
-        "ngrok",
         "node",
         "optipng",
         "pngcrush",
-        "postgresql",
         "python",
         "python3",
-        "qt",
-        "rbenv --HEAD",
+        "rbenv",
         "rbenv-gem-rehash",
-        "redis",
-        "ruby-build",
         "tig",
         "tmux",
         "wget",
@@ -96,7 +69,6 @@
     ],
     "icons": {
         "Firefox": "~/Dropbox/Images/Icons/Firefox.icns",
-        "Slack": "~/Dropbox/Images/Icons/Slack.icns",
         "MacVim": "https://github.com/jasonlong/macvim/blob/024f6d4395c3e2f873e020cdddd7f3d22d05166a/src/MacVim/icons/MacVim.icns?raw=true",
         "Slack": "~/Dropbox/Images/Icons/Slack.icns",
         "Steam": "~/Dropbox/Images/Icons/Steam.icns"
diff --git a/scripts/update_ruby.sh b/scripts/update_ruby.sh
index 58e1587c..b5253599 100755
--- a/scripts/update_ruby.sh
+++ b/scripts/update_ruby.sh
@@ -11,6 +11,6 @@ else
 fi
 
 echo "Updating Ruby"
-rbenv install 2.1.3 --skip-existing
-rbenv global 2.1.3
+rbenv install 2.2.0 --skip-existing
+rbenv global 2.2.0
 gem update --system
diff --git a/symlinks/fish/config.fish b/symlinks/fish/config.fish
index 3b03106b..ad7a927d 100644
--- a/symlinks/fish/config.fish
+++ b/symlinks/fish/config.fish
@@ -39,7 +39,7 @@ set fish_color_cwd green
 
 # rbenv support
 set -gx RBENV_ROOT /usr/local/var/rbenv
-if which rbenv > /dev/null
+if which rbenv > /dev/null and status --is-interactive
     . (rbenv init -|psub)
 end
 
diff --git a/symlinks/sh/.aliases b/symlinks/sh/.aliases
index 607864f1..adbebb14 100755
--- a/symlinks/sh/.aliases
+++ b/symlinks/sh/.aliases
@@ -1,9 +1,11 @@
 # vim:ft=sh
 
 alias battery="pmset -g ps"
+alias cdcloud='cd ~/Library/Mobile\ Documents'
 alias cdesrc='cd ~/Documents/src/etc'
 alias cdisrc='cd ~/Documents/src/instacart'
 alias cdmsrc='cd ~/Documents/src/msanders'
+alias cdscratch='cd ~/Scratch'
 alias cdsrc='cd ~/Documents/src'
 alias cman="man -S2:3"
 alias hide="chflags hidden"
diff --git a/symlinks/vim/.vimrc b/symlinks/vim/.vimrc
index 66a34632..6433fc9f 100755
--- a/symlinks/vim/.vimrc
+++ b/symlinks/vim/.vimrc
@@ -17,6 +17,7 @@ set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
 Plugin 'Keithbsmiley/swift.vim'
+Plugin 'editorconfig/editorconfig-vim'
 Plugin 'airblade/vim-rooter'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'dag/vim-fish'