Merge remote-tracking branch 'robbyrussell/master'

Conflicts:
	.gitignore
update cygwin.zsh
Merge remote-tracking branch 'robbyrussell/master'
Merge branch 'master' of git://github.com/liang8305/oh-my-zsh
update
Merge branch 'master' of https://github.com/liang8305/oh-my-zsh