Consistency and formatting across template files.

A quick consistency / formatting PR.

Ideally, on the next round, PG and the Makefile system will pull from a common template location so we don't have to keep so we can conditionally grab a different template only if it is defined (i.e. for ios or for a special arm linux version, etc).