Updated to published version of Tavis.UriTemplates
Fixed some out of date samples and formatting errors