Update to TextMate 2
Merge branch 'textmate2'