clean conf + use vim for diff with git