Fix broken templating - use re.sub and %token% style
Remove references to pkginfo