Merges editor=vim and commenting out push