Fixed vimrc
Merge branch 'master' of https://github.com/alkafir/dotfiles

Conflicts:
	vimrc