Merge branch 'master' of https://github.com/kuntau/dotfiles

merge office and home

	modified:   gitconfig
	modified:   vimrc
	modified:   zsh/aliases.zsh
Merge branch 'master' of https://github.com/kuntau/dotfiles

merge home & office