Added an error marker & edited rc files.
Merge branch 'master' of https://github.com/maximaximal/VIMconfig

Conflicts:
	.VimballRecord
	.gitmodules
	.netrwhist