Merge pull request #4 from joelwurtz/context-builder

[Context] Separate notion of Context and ContextBuilder