Merged lots of changes in sublime text build 3059 into the syntax file

Merged lots of changes in sublime text build 3059 into the syntax file