Template settings override fix
Merge pull request #848 from gpierret/master

Template settings override fix
debugging
Merge branch 'proxy' of github.com:spumko/hapi into proxy
Merge branch 'master' of github.com:spumko/hapi into proxy
fix test
Merge branch 'proxy' of github.com:spumko/hapi into proxy

Merging upstream
Increasing allowed sockets to 10 for client