Update the vimrc

- Unnecessary plugins were removed
Merge branch 'master' of https://github.com/ovu/dotfiles

Conflicts:
	.vimrc