split up proxy.py
finish proxy.py split up
fix mentions of CONTENT_MISSING in libmproxy.console
Merge pull request #233 from mitmproxy/untangle_circular_dependencies

Untangle circular dependencies