updated to .cask and Brewfile
stuff changed a lot
some new files added
vundle submodule updated
add antigen submodule
merge .cask with Brewfile
Merge remote-tracking branch 'michaelcontento/master'

Conflicts:
	.brew
	.gitconfig
	.gitmodules
	.osx
	.pip/pip.conf
	.zshrc
	install.sh
	zsh/oh-my-zsh-custom/plugins/aliases/aliases.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/awsenv/awsenv.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/fastgit/fastgit.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/lastcd/lastcd.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/monkey/monkey.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/nvm/nvm.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/osx-bindkey/osx-bindkey.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/pyenv/pyenv.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/rbenv/rbenv.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/terminate_vbox/terminate_vbox.plugin.zsh
	zsh/oh-my-zsh-custom/plugins/virtualenv/virtualenv.plugin.zsh
fixed missing iconv in rsync alias