Revamp my .vim files with newest extensions

Conflicts:
	.gitignore
	vimrc