Added wombat, added .gvimrc, added CTRL+c|v
Merged conflict
Merge branch 'master' of https://github.com/bumbashock/vim

Conflicts:
	.gitmodules