Tidy up the template

	* src/template/Makefile.am: Minor layout changes.
	* src/template/template.c: Change to GNU style layout, added license
	declaration, C-style comments, added emacs style comment.
Correct last ChangeLog attribution.
Merge branch 'master' into jeremy

Conflicts (resolved):
	ChangeLog