reorganized server.js
Merge branch 'master' into codeCleanup
Merge pull request #89 from KyleW/codeCleanup

Split sockets into their own file.