update from home-pc
Merge branch 'master' of https://github.com/Red-Li/vimrc

Conflicts:
	vimrcs/extended.vim