stylefixes to sockets.js
removed old socket request handler
fixed merge conflict
fixed renaming issue
Merge pull request #31 from ndvr/tyler

Tyler