Added completion stuff

Conflicts:
	.vimrc