Upgrade oh-my-zsh
Stuff
Upgrade vundle
Merge branch 'master' of github.com:linkinpark342/dotfiles

Conflicts:
	ackrc
	zsh/custom/legacy.zsh
	zshenv