Detect textmate 2 as textmate
Merge branch 'master' of https://github.com/gnachman/iTerm2