Big merge from experimental to bleeding edge.

samples/swarm/UIState.dart

Index: samples/swarm/UIState.dart
diff --git a/samples/swarm/UIState.dart b/samples/swarm/UIState.dart
index 8fc1b904911f74ff315e89e8503f99a942bdd836..b03043534857a0a7bb1080dc8a3eb0500cef5522 100644
--- a/samples/swarm/UIState.dart
+++ b/samples/swarm/UIState.dart
@@ -35,7 +35,7 @@ abstract class UIState {
         // the views for this.
         window.history.replaceState(null, document.title, '#');
       } else if (state != '') {
-        loadFromHistory(JSON.parse(state));
+        loadFromHistory(json.parse(state));
       }
       firstEvent = false;
     });
@@ -55,7 +55,7 @@ abstract class UIState {
       throw 'history tracking not started';
     }
 
-    String state = JSON.stringify(toHistory());
+    String state = json.stringify(toHistory());
 
     // TODO(jmesserly): [state] should be an Object, and we should pass it to
     // the state parameter instead of as a #hash URL. Right now we're working