Change git merge tool to terminal vim
Update osx script