stubbed client, fixed bad loop in websocket server
Merge branch 'master' of github.com:aosmith/canary