Updating rake globbing
Merge branch 'master' of github.com:rogeruiz/oh-my-zsh

Conflicts:
	lib/aliases.zsh