ughhh
closer
cleanup
Merge branch 'master' of github.com:jkresner/ghost

Conflicts:
	client/room/list.coffee
	client/room/list.html
	client/user/detail.html