fix bug
Merge branch 'master' of github.com:mygoare/.vim

Conflicts:
	README.markdown