Tidied up nginx templates and output

Made template files and generated config files easier to read
Just a heads up - doesn't matter to me either way really: using `<%-` at the start of the line is superfluous: the `-` tells erb to strip any leading whitespace, and there is none when `<%-` is at the beginning of the line. 

For example:
```
ERB.new('         <%- if true %>foo <% end %>bar', 0, '-').result
# => "foo bar"
ERB.new('<%- if true %>foo <% end %>bar', 0, '-').result
# => "foo bar"
```
In the above example, you can see that the white space is stripped with "  <%-" - however, when there is no leading whitespace, you end up with the same result.