analytics bug fixes,  adding init.origin
added a return, code cleanup
don't add guest account in room.old
added return
Merge branch 'master' into bug-fixes

Conflicts:
	socket/socket-client.js
Merge pull request #148 from scrollback/bug-fixes

Analytics bug fixes