Merge remote-tracking branch 'robby/master'
Merge remote-tracking branch 'robby/master'

Conflicts:
	tools/upgrade.sh
Merge branch 'master' of github.com:chriswk/oh-my-zsh

Conflicts:
	tools/upgrade.sh