mixing in noel's current changes
recovering old styles
recovering more old styles
Merge branch 'noel' into weatherblur

Conflicts:
	mod/weatherblur_theme/css/buttons.less
	mod/weatherblur_theme/css/typography.less
accidental overwrite
lost discussion icon css, replaced
remove editor removed, mce put back on discussion edit page