Remove .DS_store files
Fix bugs caused by recent socket.io update

This commit is for the actual files _I_ edited
Resolve all repo issues