Socket.io changes
Merge branch 'master' of https://github.com/couchtape/couchtapeapp