update nbconvert2 to master