locking socket.io to 1.1.0, fixes #6
Merge branch 'master' into develop