finished rest/socket stuff
Merge pull request #37 from ndvr/tyler

finished rest/socket stuff