Update plugin names - by oh-my-zsh deprecations.
Merge branch 'master' of git://github.com/brain-geek/dotfiles

Conflicts:
	zshrc