Misc update
Merge branch 'master' of https://github.com/fegin/vimrc

Conflicts:
	vimrc