Added server.js back into override as socket.io is specific to lifestream
Added socket.io stuff into server.js