Advances in the treatment of explicit water molecules in docking and binding free energy calculations