put back in the context manager

Turns out this will clean up some code in edx-platform enormously.  Note I haven't added back in anonymous contexts, just enabled named context wrappers around small blocks of code.