An improved coarse-grained model of solvation and the hydrophobic effect.