Move content-wrapper up to default layout

Here's the rearrange I was talking about.

What I'm not sure about:
* does the modal need to be included everywhere?
* Does ```{% include post-overlay.html %}``` need to go in a specific location in the HTML?