diff --git a/README.md b/README.md
index 02f05dd..491a1de 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@ dotfiles
 Fresh OS X box? Full machine setup including dotfiles:
 
 ```
-curl https://raw.github.com/nixme/dotfiles/master/bin/setup-machine | sh
+curl https://raw.githubusercontent.com/nixme/dotfiles/master/bin/setup-machine | bash
 ```
 
 Existing box or Linux? Just install dotfiles:
 
 ```
-curl https://raw.github.com/nixme/dotfiles/master/bin/install-dotfiles | sh
+curl https://raw.githubusercontent.com/nixme/dotfiles/master/bin/install-dotfiles | bash
 ```
 
 _(running random scripts off the internet is lame. thankfully they're my scripts. inspect first)_
diff --git a/bin/setup-machine b/bin/setup-machine
index 51b51f2..6026c65 100755
--- a/bin/setup-machine
+++ b/bin/setup-machine
@@ -2,7 +2,7 @@
 #
 # Set up my preferred OS defaults, common programs, and general environment.
 #
-# OS X 10.8 Mountain Lion only for now.
+# OS X 10.10 Yosemite only for now.
 #
 # Inspired by https://github.com/mathiasbynens/dotfiles/blob/master/.{osx,brew}
 #
@@ -12,6 +12,7 @@
 # - Xcode installed
 # - Xcode CLI tools installed
 # - Computer has been named via System Preferences > Sharing
+# - Any applicable App Store Purchased apps should be installed too.
 
 # Preauthorize with keep-alive.
 sudo -v
@@ -23,24 +24,53 @@ mkdir -p ~/Applications
 
 ################################### HOMEBREW ###################################
 
-ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
+ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-brew install git tmux most tree readline chruby ruby-build nodejs \
-             reattach-to-user-namepsace ack the_silver_searcher \
-             aspell heroku-toolbelt
-
-# Latest XCode CLI tools do not include regular GCC, only LLVM-GCC. So install
-# gcc-4.2 based on Apple's latest sources.
+# Add dupes so we can install newer GCC's and other basic unix tools that Apple
+# never updates. Add versions so we can install old versions when needed.
 brew tap homebrew/dupes
-brew install apple-gcc42
+brew tap homebrew/versions
+
+# Install common CLI apps and daemons we always use.
+brew install homebrew/versions/gcc49 git tmux most tree readline chruby \
+             ruby-build node ack the_silver_searcher aspell heroku-toolbelt hub \
+             curl postgresql redis memcached
+brew install reattach-to-user-namespace --wrap-pbcopy-and-pbpaste --wrap-launchctl
+
+# homebrew-cask for managing binary apps
+brew install caskroom/cask/brew-cask
+brew tap caskroom/versions
+brew cask install google-chrome
+brew cask install google-chrome-canary
+brew cask install iterm2
+brew cask install rdio
+brew cask install transmission
+brew cask install github
+brew cask install onepassword
+brew cask install imageoptim
+brew cask install imagealpha
+brew cask install skype
+brew cask install selfcontrol
+brew cask install vlc
+brew cask install shady
+brew cask install beamer
+brew cask install atom
+brew cask install java
+brew cask install steam
+brew cask install dropbox
+brew cask install totalfinder
+brew cask install parallels-desktop
+brew cask install vagrant
+brew cask install vagrant-manager
+vagrant plugin install vagrant-parallels
 
 
 ################################ ZSH & DOTFILES ################################
 
 brew install --disable-etcdir zsh
-$homebrew_zsh=/usr/local/bin/zsh
+homebrew_zsh=/usr/local/bin/zsh
 echo $homebrew_zsh | sudo tee -a /etc/shells
-sudo chsh -s $hombrew_zsh $USER
+sudo chsh -s $homebrew_zsh $USER
 
 if [ ! -d ~/.dotfiles ]; then
   curl https://raw.github.com/nixme/dotfiles/master/bin/install-dotfiles | sh
@@ -49,55 +79,34 @@ fi
 
 #################################### EMACS #####################################
 
-# Latest release
-url=$(curl http://emacsformacosx.com/atom/release |
-    ruby -r"rexml/document" -e "puts REXML::Document.new($<).elements['feed/entry/link'].attributes['href']")
-dmg=_emacs_app.dmg
-curl -L -o $dmg $url
-hdiutil mount $dmg
-cp -R /Volumes/Emacs/Emacs.app ~/Applications
-hdiutil unmount /Volumes/Emacs
-rm $dmg
+brew install emacs --cocoa
 
 
 ##################################### RUBY #####################################
 
-ruby19=1.9.3-p429                   # Current patchlevels
-ruby20=2.0.0-p195
-global_gems="bundler spring pry"    # Gems to install globally for each ruby
+ruby21=2.1.5
+global_gems="bundler pry"    # Gems to install globally for each ruby
 
 # Compile with real GCC and readline. Clang or gcc-llvm make for a buggy MRI,
 # and libedit messes up colored prompts.
-export CC=gcc-4.2
+export CC=gcc-4.9
 export RUBY_CONFIGURE_OPTS="--with-readline-dir=`brew --prefix readline`"
-rbenv install $ruby19
-rbenv install $ruby20
+rbenv install $ruby21
 
-rbenv global $ruby20                # Default to Ruby 2.0
+rbenv global $ruby21                # Default to Ruby 2.1.5
 rbenv rehash
 
-rbenv shell $ruby19
-gem install $global_gems
-rbenv shell $ruby20
+rbenv shell $ruby21
 gem install $global_gems
 
 
 #################################### ITERM #####################################
 
-read -r -p "iTerm2 Manual Install:
-1. Download iTerm2 from https://code.google.com/p/iterm2/downloads/list
-2. Install to ~/Applications
-3. Open iTerm2 and then it's Preferences
-4. Select 'Load preferences from a custom folder or URL:'
-5. Choose '~/.iterm2'
-
-Press Return when finished."
-
-
-#################################### JAVA ######################################
+read -r -p "iTerm2 Manual Configuration:
+1. Open iTerm2 and then it's Preferences
+2. Select 'Load preferences from a custom folder or URL:'
+3. Choose '~/.iterm2'
 
-read -r -p "Install Oracle Java JDK 7 from
-  http://www.oracle.com/technetwork/java/javase/downloads/index.html
 Press Return when finished."