Minor template fixes

This fixes a collection of minor nitpicks I spotted in the templates while working on cleaning out unneeded templates in pyconza2014.