misc updates
Merge branch 'master' of https://github.com/zhuangya/.vim

Conflicts:
	vimrc