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

Conflicts:
	README.md