Fix our GIT_EDITOR magic some more

Could someone please review this. I am not quiet trusting my judgement right now but something like this needs to be pushed out soon.