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

Conflicts:
	vimrc