modified files for Windows
Merge branch 'master' of https://github.com/mpeebles/vim_config

Conflicts:
	README.md
	vimrc