Add ribbon to git.
Tweak aliases
change trust exit code for diffmerge as per blog post
fix dropbox alias, move path declaration into .path
Remove duplicate alias