log function should only emit once if _server object
Follow coding conventions concerning semicolons; Don't initialize variables explicity as "undefined"

This commit doesn't break anything. I added a bunch of semicolons in order to be more consistent regarding the style guide. Basically, JSHint passes now (except for one function being initialized inside a for-loop).
fix #1760
fix  Content-Type overriding issue  #1760
Fix passthrough headers merge. Closes #1776
Merge branch 'master' of github.com:spumko/hapi
Merge pull request #1756 from alexanderGugel/master

Follow coding conventions concerning semicolons; Don't initialize variab...
fix 204 handling and inject without payload. Closes #1781, Closes #1782
Merge branch 'master' of github.com:spumko/hapi
Initial HTTP range support for #1754
6.1.0
Sort and consolidate ranges. For #1754
etag() helper. Closes #1783
test for 1733
Merge pull request #1733 from lloydbenson/master

log function should only emit once if _server object
Merge branch 'master' of github.com:spumko/hapi
Cleanup for #1733
Merge pull request #1762 from MidnightWonderer/master

fix content-type overriding issue #1760.
Cleanup for #1762
resolve conflicts