update vimrc
Merge branch 'master' of https://github.com/oz123/dude

Conflicts:
	config_files/vimrc
update vimrc to solve conflicts