modified identity templates added, etc

I took a quick stab at shortening the file by handling the attributes
slightly differently.  A similar approach could probably be taken for
the element templates.