Add bundle alias
Merge branch 'master' of https://github.com/dfang/oh-my-zsh

Conflicts:
	templates/zsh_aliases