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

Conflicts:
	.gitmodules
	.netrwhist
	vimrc
created README.md