Use ContextProxy everywhere

Mike Boers
2014-07-14T17:54:39Z

Fix use of `ContextProxy` to remove circular references.

See #14.