Add output buffers and tweak existing content
Tweaks to presentation flow
Merge branch 'master' into gh-pages