Add kalediscope merge tool settings
Vim pass bang commands
Add git prompt