Transform incoming stream to template contexts
Merge branch 'master' into render-refactor
Clean up render code for results

New functions that use a template context object + a results array.
Render results by app, not "type" of noun