The static polarisability of metal clusters and spheres in an improved Thomas-Fermi approximation