Optimize block parsing -- don't recreate delimiter, use strings instead of regex
Merge pull request #384 from Shopify/optimize_block_parsing

Optimize block parsing -- don't recreate delimiter, use strings instead of regex