Bring mockup markup inline with reality and update scss/css
Some more tweaks and remove skeleton-sass, will try bourbon-neat instead.
Merge branch 'skeleton' of github.com:jcbrand/converse.js into skeleton

Conflicts:
	sass/converse.scss