Minor improvements to tm grammars

[thetarnav]

• Add punctuation tokens to comments
• inline some rules
• Add spread and range operators
• Remove repeated grammar for tags and attributes