done on macbook..
committing to attempt running from desktop.
edits in two places..
editing in two places at one time
Merge branch 'central-arch' of https://github.com/adminion/adminion into central-arch

Conflicts:
	lib/http.js
	lib/index.js
won't work on mac, trying on desktop....
done on macbook, working well!
done for the night

not sure why socket.emit('roster'...) is not sending the roster..
a bit more verbose
holy shit... v0.6.0 is here!

committing to prepare to merge into master
Merge branch 'master' of https://github.com/adminion/adminion into central-arch