Dhm/acid aside

@cpennington review (incorporates the other PR and I may should move some of these into that other one)
Nit: this seems like a needlessly concise name. It's too bad we don't have a good term for an xblock-family object, though.