updating for new websockets support and new command-line functionality
Merge pull request #1664 from Blackmist/node-websocket

updating for new websockets support and new command-line functionality