Merge branch 'master' into tree-massage

src/app/editor.coffee

@@ -759,6 +759,7 @@ class Editor extends View
       @underlayer.css('min-width', minWidth)
       @overlayer.css('min-width', minWidth)
       @layerMinWidth = minWidth
+      @trigger 'editor:min-width-changed'
 
   clearRenderedLines: ->
     @renderedLines.empty()

src/app/text-mate-grammar.coffee

@@ -53,6 +53,7 @@ class TextMateGrammar
 
         tokens.push(nextTokens...)
         position = tokensEndPosition
+        break if position is line.length and nextTokens.length is 0
 
       else # push filler token for unmatched text at end of line
         if position < line.length