add vim as preferred editor
Merge branch 'master' of github.com:mklj/confbox

Conflicts:
	gitconfig