Add content blocks to the main template
- Add site-title and sidebar content blocks
- Replace the includes.html with the includes content block
- Add a sample override to the default_config flavor
Rename the 'default_config' flavor to 'default'
Merge pull request #55 from openplans/content-blocks

Content blocks
Merge branch Shareabouts 3.8.0, 'master' into divvy-branding
Update the divvy template to use the new content blocks