fixes
Add some style
Merge branch 'scott' of https://github.com/sgnl/project_keystone into side-branch

Conflicts:
	public/js/draft_client_draft_chat.js