Merged websocket-complete branch into master. Lets get ready to delete the websocket branch.