Tidy up a few things

- Have `.content_wrapper` extend `.wrapper`
- Remove `.sidebar_item`; `.block`s should be used instead
- Make cf-grid helpers an official part of this component
Update cf-core to 0.6.0