.vimrc: organize with block comments
Merge branch 'master' of https://github.com/ajclisso/dotfiles

Conflicts:
	.vimrc