Add postgres.app support.
Add diff/merge tools.
Update subl.