Merges with recent changes, updates package.json, and adds jQuery and moment

Nice work, I didn't think that using the same port with `ws` was possible. :grinning: 

I've merged recent changes and made a few additions. Is this now complete enough for you to submit a pull request? I think it will be convenient if Casey merges this into the master repo.

ref cliss#1