Merge pull request #1 from creationix/master

Simplified the relationship between namespaces and contexts.