Working on getting Cosmo up and working.
Merge branch 'master' of https://github.com/EricBoersma/jabberbox

Conflicts:
	app/views/layouts/application.html.erb