New Version of US NSF Cyberinfrastructure Plan