Merge acorn 1.0.0 (formerly 'update to modular acorn' in original history).

test/run.js

@@ -1,15 +1,18 @@
 (function() {
-  var driver;
+  var driver, acorn;
 
   if (typeof require !== "undefined") {
     driver = require("./driver.js");
     require("./tests.js");
     require("./tests-harmony.js");
     require("./tests-flow.js");
-    require("./tests-babel.js");
     require("./tests-jsx.js");
+    require("./tests-babel.js");
+    require("babel/register")
+    acorn = require("../src")
   } else {
     driver = window;
+    acorn = window.acorn;
   }
 
   var htmlLog = typeof document === "object" && document.getElementById('log');
@@ -50,7 +53,7 @@
   var stats, modes = {
     Normal: {
       config: {
-        parse: (typeof require === "undefined" ? window.acorn : require("../acorn.js")).parse
+        parse: acorn.parse
       }
     }
   };