Update to my cf_rewrite code

Today J.J. Merrick linked to my cf_rewrite post, which reminded me that I had improved the code but never posted it. I've updated the original post with some new code and updated the demo to reflect the change. View the original post here.