socket basically working
Merge branch 'master' of github.com:philwil/Things