Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/git/alias.zsh
Merge branch 'master' of github.com:knl/prezto