added gitvimdiff and some other nonsense
added gitvimdiff and some other nonsense