Cleanup orderedMergeStream
Merge pull request #44 from jpettersson/ejs-inline-includes

EJS inline includes
Merge branch 'master' into template-context