Don't use sshconfig
comment out proxy setting to prevent from influencing git-tfs
Support TFS branch in git-tfs aliases
Merge commit '3082a435433285ca0d5bccc515783183922df6cc' into cht_win
Set encoding of GUI to utf-8
Merge branch 'master' of https://github.com/ansoncat/uxconf
Merge commit '79c392d18920a2cb1c662e82cc4f74cdf770d76b'

Conflicts:
	gitconfig
Source /etc/bashrc in centos
Merge branch 'centos' of https://github.com/ansoncat/uxconf into centos