Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/git/git.plugin.zsh
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:eiginn/oh-my-zsh

Conflicts:
	plugins/git/git.plugin.zsh