Make diffmerge defualt merging/diffing tool again.
Add bash completion for ports and iterm_exec, create aliases for iterm scripts, and add port vars fro common applications.