adding $GIT_EDITOR
updating gitconfig to use vim as editor
merge