Give controller for pad.html a more appropriate name.

node/utils/tar.json

@@ -1,6 +1,7 @@
 {
   "pad.js": [
     "jquery.js"
+  , "pad.js"
   , "ace2_common.js"
   , "pad_utils.js"
   , "plugins.js"
@@ -17,7 +18,6 @@
   , "pad_impexp.js"
   , "pad_savedrevs.js"
   , "pad_connectionstatus.js"
-  , "pad2.js"
   , "jquery-ui.js"
   , "chat.js"
   , "excanvas.js"

static/js/pad_utils.js

@@ -34,7 +34,7 @@ var padutils = {
   },
   uniqueId: function()
   {
-    var pad = require('/pad2').pad; // Sidestep circular dependency
+    var pad = require('/pad').pad; // Sidestep circular dependency
     function encodeNum(n, width)
     {
       // returns string that is exactly 'width' chars, padding with zeros
@@ -209,7 +209,7 @@ var padutils = {
   },
   timediff: function(d)
   {
-    var pad = require('/pad2').pad; // Sidestep circular dependency
+    var pad = require('/pad').pad; // Sidestep circular dependency
     function format(n, word)
     {
       n = Math.round(n);

static/pad.html

@@ -298,7 +298,7 @@
 
         <script>
             /* TODO: These globals shouldn't exist. */
-            pad = require('/pad2').pad;
+            pad = require('/pad').pad;
             chat = require('/chat').chat;
             padeditbar = require('/pad_editbar').padeditbar;
             padimpexp = require('/pad_impexp').padimpexp;