Add 'dep' alias and function to open all git conflicts in vim
Add iTerm2 preferences