Reorganise whitespace in the vhost header and location header/footer.

The current template inserts newlines after a location, which doesn't
seem logical; one can't assume there will always be more blocks that
follow. Therefore it is only logical to include the newline before a
new location block is inserted, which lends itself to the convention
of only prepending newlines to blocks, never appending them.
fix my name
Merge pull request #504 from ripienaar/patch-1

fix my name
Merge pull request #502 from cewood/vhost-whitespace

Reorganise whitespace in the vhost header and location header/footer.
change logdir to log_dir when calling config from init
Revert d08b1408

Change was committed to wrong branch
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into rip-out-module-data

Conflicts:
	docs/hiera.md
fixing up specs/config parameters