no message
Merge branch 'Develop' of https://github.com/vimconfig/vimrc into Develop

Conflicts:
	vimrc.local
no message
Update README.md
Merge branch 'Release'
Merge branch 'master' into Develop
no message
Merge branch 'Develop' of https://github.com/vimconfig/vimrc into Develop