pull
Merge branch 'master' of https://github.com/xuwupeng2000/.vim

Conflicts:
	myzshrc
fix tmux + vim 256 color