Pulling latest osdi changes back into my fork so I can do some updates...I think