Ruby 2.0 compatibility.
Bump em-websocket (and eventmachine as a consequence).  I suspect this is needed for Ruby 2.0 compatibility.
Merge branch 'master' into ruby-2.0
Merge branch 'master' into ruby-2.0
Merge branch 'master' into ruby-2.0