Make vim Zoom Mode better
Merge branch 'master' of github.com:robertkluin/dotfiles

Conflicts:
	vimrc