Big merge from experimental to bleeding edge.

utils/pub/command_update.dart

Index: utils/pub/command_update.dart
diff --git a/utils/pub/command_update.dart b/utils/pub/command_update.dart
index 1dda303e7ccce261c80bfa7584f46f85da4b0c24..4757049cd26e335d63f0417f9c83d8af6557310f 100644
--- a/utils/pub/command_update.dart
+++ b/utils/pub/command_update.dart
@@ -4,6 +4,7 @@
 
 library command_update;
 
+import 'dart:async';
 import 'entrypoint.dart';
 import 'log.dart' as log;
 import 'pub.dart';
@@ -22,6 +23,6 @@ class UpdateCommand extends PubCommand {
     } else {
       future = entrypoint.updateDependencies(commandOptions.rest);
     }
-    return future.transform((_) => log.message("Dependencies updated!"));
+    return future.then((_) => log.message("Dependencies updated!"));
   }
 }