Herbert Diess keeps job, will steer VW into its electric future