Rust upgrade
Fix infinite loop on token reconsumption
Implement BeforeHtml mode
BeforeHead mode
Be more consistent about macro_rules! formatting