Fix conflict with socketio
Merge pull request #106 from pgiraud/socketio_conflict

Fix conflict with socketio