Branch switch
Merge branch 'master' into cw

Pulling in Monica's column checker
Testing @contextmanager to reduce boilerplate, might break things
Replaced json boilerplate with a @contextmanager

Still works
Way cooler
Merge branch 'cw'

Merging use of @contextmanager