Progress towards URI template matching

* Had this working before trying to add URI template matching. After, the
requests appear to be out of order.
* Includes build updates