cleanup brew stuff

install/_install.sh

@@ -21,11 +21,7 @@ brew install clipper
 brew install coreutils
 brew install git
 brew install macvim --with-cscope --with-lua --HEAD
-brew install rbenv
-brew install ruby-build
 brew install tmux
-brew install the_silver_searcher
-brew install wget
 brew install zsh
 
 brew cask install forklift
@@ -47,9 +43,9 @@ git submodule update
 # link the dotfiles
 ln -s ~/dotfiles/agignore ~/.agignore
 ln -s ~/dotfiles/editorconfig ~/.editorconfig
+ln -s ~/dotfiles/eslintrc ~/.eslintrc
 ln -s ~/dotfiles/gitconfig ~/.gitconfig
 ln -s ~/dotfiles/gitignore ~/.gitignore
-ln -s ~/dotfiles/eslintrc ~/.eslintrc
 ln -s ~/dotfiles/slate.js ~/.slate.js
 ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 ln -s ~/dotfiles/vim ~/.vim

install/brew.sh

@@ -4,22 +4,25 @@ brew tap homebrew/dupes
 brew tap homebrew/php
 
 # install additional brew packages -- see _install.sh too
+brew install boot2docker
+brew install composer
 brew install curl
 brew install docker
-brew install boot2docker
 brew install fasd
 brew install git-extras
 brew install git-flow
 brew install httpd
+brew install imagemagick
 brew install markdown
 brew install mysql
 brew install php56
 brew install php56-mcrypt
 brew install php56-xdebug
-brew install php56-intl
-brew install composer
+brew install rbenv
+brew install ruby-build
 brew install ssh-copy-id
-brew install unrar
+brew install the_silver_searcher
+brew install wget
 brew install youtube-dl
 
 # brew cask and install software

zsh/aliases

@@ -79,7 +79,7 @@ alias npmre='rm -rf node_modules && npm cache clean && npm install'
 # easy hosts / apache / php editing
 alias hosts='sudo vim /etc/hosts'
 alias vhosts='sudo vim /usr/local/etc/apache2/extra/httpd-vhosts.conf'
-alias phpini='vim /usr/local/etc/php/5.5/php.ini'
+alias phpini='vim /usr/local/etc/php/5.6/php.ini'
 alias httpconf='vim /usr/local/etc/apache2/httpd.conf'
 
 # docker stuff

zsh/zsh-completions

@@ -1 +1 @@
-Subproject commit 6cc78eb382a62ad99cb0c900d4ed623af9cee10a
+Subproject commit 68c949470eaa87c5d67080d32fb2b69c8b837eb4