Context's now put thier keys in a dict.
Fix rebase conflict.
Merge pull request #315 from cowlicks/Namespaces-are-one-honking-great-idea

Refactor key-management