Merge branch 'master' of github.com:rmspatches/dotvim

Conflicts:
	README.md
Merge branch 'master' of github.com:rmspatches/dotvim