Added better templating
Merge branch 'kelp' of github.com:msmith-techempower/FrameworkBenchmarks into kelp

Conflicts:
	kelp/conf/config.pl