reclaim last few commits on Christopher's fork into institutional 

current production is running code checked out from Christopher's fork; we're going to change this, but first want to be as close to up-to-date as possible.