config.
Merge branch 'master' of github.com:peter50216/dotfiles

Conflicts:
	vim/.vimrc
	zsh/.zshrc