Some vim changes
Add zsh-syntax-highlighting
Magic
Merge branch 'master' of git://github.com/linkinpark342/dotfiles

Conflicts:
	vimrc
	zshrc