Merge pull request #2 from JohnMcLear/develop

Updating develop to latest changes
Fixed loadError() function calls missing socket parameter

I think I got all of the cases where a connected browser could crash a
server that tried to restart/start up.
Merge pull request #39 from tranek/develop

Fixed pre-existing connections crashing a server during restart take 2