Autoactivate virtualfish
Use ksdiff to git merge by default