fixed some weird indentation issues
Merge branch 'master' of https://github.com/josephg/ShareJS
fix tests

properly remove listeners from websocket on sockjs tests
have websocket tests use websocket package instead of ws (like sockjs)
innerText to textContent

innerText fails on latest Firefox, textContent is W3C-compliant (http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#Node3-textContent)
Merge pull request #188 from themgt/patch-1

innerText to textContent
Merge pull request #187 from mad-eye/fix-tests

fix tests
Added a small comment
Fix race condition crash
Bump to 0.6.1
Recompiled package.json
Removed buggy old socket.io code. Socketio is not supported. Stop using it.
modified:   examples/hex.html
Merge pull request #190 from joshuapurcell/master

Fix typo in hex.html
Actually removed etherpad from default build
Recompiled without etherpad in the base sharejs file