Add gvim settings
Merge branch 'master' of github.com:bensonche/tools

Conflicts:
	vimrc