Cleaned up vimrc file

Conflicts:
	vim/vimrc