Jeremywright/v0.6

merge v0.60 from LearnBoost/engine.io-client