add some configs
Merge branch 'master' of github.com:fanchangyong/dotfiles

Conflicts:
	vimrc

fix merge conflict