New bus plan approved for York and North Yorkshire