this appears to make everything go green; have to make sure that the lifecycle doesn't bite us in a running ruby process -- after running rake task, does the Organization go back to being its normal self upon each request?
merging in michael's fixes