Adding iterm2 colors
Merge branch 'master' into quinn

* master:
  Adding iterm2 colors