Adds Prezto Ruby support, updates Gitconfig diff/merge tools