diff --git a/mac b/mac
index a8c56847c..8bdd1bd3a 100755
--- a/mac
+++ b/mac
@@ -8,13 +8,19 @@ trap 'ret=$?; test $ret -ne 0 && printf "failed\n\n" >&2; exit $ret' EXIT
 
 set -e
 
+fancy_echo() {
+  printf "\n%b\n" "$1"
+}
+
 if [ ! -d "$HOME/.bin/" ]; then
+  fancy_echo "Creating home .bin folder ..."
   mkdir "$HOME/.bin"
 fi
 
-fancy_echo() {
-  printf "\n%b\n" "$1"
-}
+if [ ! -d "$HOME/Sites/" ]; then
+  fancy_echo "Creating Sites folder ..."
+  mkdir "$HOME/Sites"
+fi
 
 if [[ -f /etc/zshenv ]]; then
   fancy_echo "Fixing OSX zsh environment bug ..."
@@ -31,6 +37,21 @@ fancy_echo "Installing Homebrew, a good OS X package manager ..."
 fancy_echo "Tap Homebrew dependencies ..."
   brew tap homebrew/dupes
 
+fancy_echo "Cloning and installing dotfiles, running setup scripts ..."
+  git clone https://github.com/mattbanks/dotfiles.git ~/.dotfiles
+  cd ~/.dotfiles
+  script/bootstrap
+  fonts/copy
+  iterm2/setup
+  sublime3/setup
+  xcode/setup
+
+fancy_echo "Setting up hosts file ..."
+  cat /etc/hosts | grep sites.whatup || sudo printf "\n##\n# Matt's hosts\n##\n192.168.56.101 sites.whatup\n" | sudo tee -a /etc/hosts
+
+fancy_echo "Cloning Vagrant dev box ..."
+  git clone https://github.com/mattbanks/vagrant-dev-box.git ~/vmdevbox
+
 fancy_echo "Installing git, Node.js, Z Script ..."
   brew install git node z
 
@@ -49,12 +70,17 @@ fancy_echo "Installing Ruby 2.0.0-p247 ..."
 fancy_echo "Setting Ruby 2.0.0-p247 as global default Ruby ..."
   rbenv global 2.0.0-p247
   rbenv rehash
+  source ~/.zshrc
 
 fancy_echo "Updating to latest Rubygems version ..."
   gem update --system
 
 fancy_echo "Installing critical Ruby gems for Rails development ..."
-  gem install bundler rails compass bourbon neat --no-document
+  gem install bundler rails compass --no-document
 
 fancy_echo "Installing Essential NPM Packages - Grunt, Yeoman and Bower, because you need them ..."
   npm install -g yo grunt-cli bower npm-check-updates
+
+fancy_echo "Setting up OSX defaults ..."
+  cd ~/.dotfiles
+  osx/set-defaults.sh