Socket.io stuff
Fix conflict
Updates
Merge branch 'master' of github.com:dizballanze/debugmail
Fix conflict