Add socket.io
fix conflicts
Merge branch 'master' of https://github.com/ashleygwilliams/canary