Fixed data inconsistancy between youtube video and other embeds.
Handling what to do with a shortcode if there are no attributes within the individual shortcode parsing functions. Not all shortcodes need attributes, so this needs to be handled individually.
Added slate calendar to twig shortcode parser.
Oops. I didn't mean to delete that.
Instead of creating models of the 'Object' type and then having Object render the correct model, 'model' in the collection is now a function that finds and instantiates the correct model.
Removed unused model reference.
Created templates for content pulled via shortcode into the sidebar.
Added shortcode parsing to block model.
DIST
Resolved merge conflicts.