renaming extension; pull in David Carlisle's new and improves xsl