changes for next patch, 2d disc options for spheres, fix external upgrade, bug...

changes for next patch, 2d disc options for spheres, fix external upgrade, bug fixes for fix ave/chunk for density calcs, Aidan doc page citation deconvolution