Tidied up nginx templates and output

Made template files and generated config files easier to read