Lost in the merge? Syntax highlighting for .conf files

Also added same lines to Windows _gvimrc
Merge branch 'master' of github.com:lalligood/vim

Conflicts:
	.gvimrc
	.vimrc