Fixing test
Merge branch 'proxy' of github.com:spumko/hapi into proxy

Merging upstream
Increasing allowed sockets to 10 for client
Adding global maxSockets setting
Adding client unit tests
Adding documentation for maxSockets
Defaulting maxSockets to null
Added missing space
Merge pull request #850 from wpreul/proxy

Increasing allowed sockets to 10 for client