Explictly set editor to vim
Revert "add setting suggested by git 1.8"

This reverts commit d20f17ac27cc7fc499ccaca145d44e1087bc7c0b.

Conflicts:
	.gitconfig