Bug fixes, and for some reason a heap of whitespace cleanups#643

rauchg merged 4 commits intosocketio:mastersocketio/socket.io:masterfrom

einaros:mastereinaros/socket.io:masterCopy head branch name to clipboard