Don't scope whitespace beside key as a constant
Merge remote-tracking branch 'textmate/master'