update
Merge branch 'master' of https://github.com/tainzhi/vimfile
change vimrc
Merge branch 'master' of https://github.com/tainzhi/vimfile

Conflicts:
	vimrc