Add git difftool config, tighen up vim key delay, disable vim swap