Issue 484 - Combine Connectors and Contexts into a single column

Resolves #484.

See #537 for additional information.