updated vimrc
Merge branch 'master' of https://github.com/TaliMy/dotfiles

Conflicts:
	.vimrc