Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/commander/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/commander/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/commander/package.json	(revision 516)
@@ -38,8 +38,4 @@
   "homepage": "https://github.com/visionmedia/commander.js",
   "_id": "commander@1.1.1",
-  "_from": "commander@1.1.1",
-  "dist": {
-    "shasum": "3b3219c6eb9dd58595193f8fad0c4347e62a5df7"
-  },
-  "_resolved": "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"
+  "_from": "commander@1.1.1"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/csslint/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/csslint/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/csslint/package.json	(revision 516)
@@ -42,8 +42,8 @@
   "homepage": "https://github.com/stubbornella/csslint",
   "_id": "csslint@0.9.10",
-  "_from": "csslint@0.9.10",
   "dist": {
     "shasum": "532edf42f35158c9aaaa90590d97c3de8c9487d4"
   },
+  "_from": "csslint@0.9.10",
   "_resolved": "https://registry.npmjs.org/csslint/-/csslint-0.9.10.tgz"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js	(revision 516)
@@ -77,4 +77,5 @@
 }
 
+this._processingEmitQueue = false
 
 glob.Glob = Glob
@@ -99,6 +100,10 @@
   options = options || {}
 
+  this._endEmitted = false
   this.EOF = {}
   this._emitQueue = []
+
+  this.paused = false
+  this._processingEmitQueue = false
 
   this.maxDepth = options.maxDepth || 1000
@@ -217,17 +222,5 @@
   if (this.mark) {
     // at *some* point we statted all of these
-    all = all.map(function (m) {
-      var sc = this.cache[m]
-      if (!sc)
-        return m
-      var isDir = (Array.isArray(sc) || sc === 2)
-      if (isDir && m.slice(-1) !== "/") {
-        return m + "/"
-      }
-      if (!isDir && m.slice(-1) === "/") {
-        return m.replace(/\/+$/, "")
-      }
-      return m
-    }, this)
+    all = all.map(this._mark, this)
   }
 
@@ -246,4 +239,25 @@
 function alphasort (a, b) {
   return a > b ? 1 : a < b ? -1 : 0
+}
+
+Glob.prototype._mark = function (p) {
+  var c = this.cache[p]
+  var m = p
+  if (c) {
+    var isDir = c === 2 || Array.isArray(c)
+    var slash = p.slice(-1) === '/'
+
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
+
+    if (m !== p) {
+      this.statCache[m] = this.statCache[p]
+      this.cache[m] = this.cache[p]
+    }
+  }
+
+  return m
 }
 
@@ -272,32 +286,66 @@
 
 Glob.prototype.emitMatch = function (m) {
-  if (!this.stat || this.statCache[m] || m === this.EOF) {
-    this._emitQueue.push(m)
-    this._processEmitQueue()
-  } else {
-    this._stat(m, function(exists, isDir) {
-      if (exists) {
-        this._emitQueue.push(m)
-        this._processEmitQueue()
-      }
-    })
-  }
+  this.log('emitMatch', m)
+  this._emitQueue.push(m)
+  this._processEmitQueue()
 }
 
 Glob.prototype._processEmitQueue = function (m) {
+  this.log("pEQ paused=%j processing=%j m=%j", this.paused,
+           this._processingEmitQueue, m)
+  var done = false
   while (!this._processingEmitQueue &&
          !this.paused) {
     this._processingEmitQueue = true
     var m = this._emitQueue.shift()
+    this.log(">processEmitQueue", m === this.EOF ? ":EOF:" : m)
     if (!m) {
+      this.log(">processEmitQueue, falsey m")
       this._processingEmitQueue = false
       break
     }
 
-    this.log('emit!', m === this.EOF ? "end" : "match")
-
-    this.emit(m === this.EOF ? "end" : "match", m)
-    this._processingEmitQueue = false
-  }
+    if (m === this.EOF || !(this.mark && !this.stat)) {
+      this.log("peq: unmarked, or eof")
+      next.call(this, 0, false)
+    } else if (this.statCache[m]) {
+      var sc = this.statCache[m]
+      var exists
+      if (sc)
+        exists = sc.isDirectory() ? 2 : 1
+      this.log("peq: stat cached")
+      next.call(this, exists, exists === 2)
+    } else {
+      this.log("peq: _stat, then next")
+      this._stat(m, next)
+    }
+
+    function next(exists, isDir) {
+      this.log("next", m, exists, isDir)
+      var ev = m === this.EOF ? "end" : "match"
+
+      // "end" can only happen once.
+      assert(!this._endEmitted)
+      if (ev === "end")
+        this._endEmitted = true
+
+      if (exists) {
+        // Doesn't mean it necessarily doesn't exist, it's possible
+        // we just didn't check because we don't care that much, or
+        // this is EOF anyway.
+        if (isDir && !m.match(/\/$/)) {
+          m = m + "/"
+        } else if (!isDir && m.match(/\/$/)) {
+          m = m.replace(/\/+$/, "")
+        }
+      }
+      this.log("emit", ev, m)
+      this.emit(ev, m)
+      this._processingEmitQueue = false
+      if (done && m !== this.EOF && !this.paused)
+        this._processEmitQueue()
+    }
+  }
+  done = true
 }
 
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/package.json	(revision 516)
@@ -7,5 +7,5 @@
   "name": "glob",
   "description": "a little globber",
-  "version": "3.2.7",
+  "version": "3.2.9",
   "repository": {
     "type": "git",
@@ -26,5 +26,6 @@
   },
   "scripts": {
-    "test": "tap test/*.js"
+    "test": "tap test/*.js",
+    "test-regen": "TEST_REGEN=1 node test/00-setup.js"
   },
   "license": "BSD",
@@ -35,9 +36,5 @@
   },
   "homepage": "https://github.com/isaacs/node-glob",
-  "_id": "glob@3.2.7",
-  "dist": {
-    "shasum": "cd490a505ff7f2aef7a29ce0e4ce83d995ddbfc6"
-  },
-  "_from": "glob@>= 3.1.4",
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.7.tgz"
+  "_id": "glob@3.2.9",
+  "_from": "glob@>= 3.1.4"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/bash-results.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/bash-results.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/bash-results.json	(revision 516)
@@ -299,4 +299,5 @@
     "./test/nocase-nomagic.js",
     "./test/pause-resume.js",
+    "./test/readme-issue.js",
     "./test/root-nomount.js",
     "./test/root.js",
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/mark.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/mark.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/mark.js	(revision 516)
@@ -2,4 +2,40 @@
 var glob = require('../')
 process.chdir(__dirname)
+
+// expose timing issues
+var lag = 5
+glob.Glob.prototype._stat = function(o) { return function(f, cb) {
+  var args = arguments
+  setTimeout(function() {
+    o.call(this, f, cb)
+  }.bind(this), lag += 5)
+}}(glob.Glob.prototype._stat)
+
+
+test("mark, with **", function (t) {
+  glob("a/*b*/**", {mark: true}, function (er, results) {
+    if (er)
+      throw er
+    var expect =
+      [ 'a/abcdef/',
+        'a/abcdef/g/',
+        'a/abcdef/g/h',
+        'a/abcfed/',
+        'a/abcfed/g/',
+        'a/abcfed/g/h',
+        'a/b/',
+        'a/b/c/',
+        'a/b/c/d',
+        'a/bc/',
+        'a/bc/e/',
+        'a/bc/e/f',
+        'a/cb/',
+        'a/cb/e/',
+        'a/cb/e/f' ]
+
+    t.same(results, expect)
+    t.end()
+  })
+})
 
 test("mark, no / on pattern", function (t) {
@@ -19,4 +55,6 @@
     t.same(results, expect)
     t.end()
+  }).on('match', function(m) {
+    t.similar(m, /\/$/)
   })
 })
@@ -37,4 +75,6 @@
     t.same(results, expect)
     t.end()
+  }).on('match', function(m) {
+    t.similar(m, /[^\/]$/)
   })
 })
@@ -54,4 +94,6 @@
     t.same(results, expect)
     t.end()
+  }).on('match', function(m) {
+    t.similar(m, /\/$/)
   })
 })
@@ -71,4 +113,6 @@
     t.same(results, expect)
     t.end()
+  }).on('match', function(m) {
+    t.similar(m, /\/$/)
   })
 })
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/readme-issue.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/readme-issue.js	(revision 516)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/node_modules/glob/test/readme-issue.js	(revision 516)
@@ -0,0 +1,36 @@
+var test = require("tap").test
+var glob = require("../")
+
+var mkdirp = require("mkdirp")
+var fs = require("fs")
+var rimraf = require("rimraf")
+var dir = __dirname + "/package"
+
+test("setup", function (t) {
+  mkdirp.sync(dir)
+  fs.writeFileSync(dir + "/package.json", "{}", "ascii")
+  fs.writeFileSync(dir + "/README", "x", "ascii")
+  t.pass("setup done")
+  t.end()
+})
+
+test("glob", function (t) {
+  var opt = {
+    cwd: dir,
+    nocase: true,
+    mark: true
+  }
+
+  glob("README?(.*)", opt, function (er, files) {
+    if (er)
+      throw er
+    t.same(files, ["README"])
+    t.end()
+  })
+})
+
+test("cleanup", function (t) {
+  rimraf.sync(dir)
+  t.pass("clean")
+  t.end()
+})
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/cli/package.json	(revision 516)
@@ -50,9 +50,5 @@
   "readmeFilename": "README.md",
   "_id": "cli@0.4.5",
-  "dist": {
-    "shasum": "e4be7ec0a35b5ce30039b58f9382fc4f4b881810"
-  },
   "_from": "cli@0.4.x",
-  "_resolved": "https://registry.npmjs.org/cli/-/cli-0.4.5.tgz",
   "scripts": {}
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/.jscs.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/.jscs.json	(revision 516)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/.jscs.json	(revision 516)
@@ -0,0 +1,119 @@
+{
+    "requireCurlyBraces": [
+        "if",
+        "else",
+        "for",
+        "while",
+        "do",
+        "try",
+        "catch"
+    ],
+    "requireSpaceAfterKeywords": [
+        "if",
+        "else",
+        "for",
+        "while",
+        "do",
+        "switch",
+        "return",
+        "try",
+        "catch"
+    ],
+    "requireParenthesesAroundIIFE": true,
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "requireMultipleVarDecl": true,
+    "disallowEmptyBlocks": true,
+    "disallowSpacesInsideObjectBrackets": true,
+    "disallowSpacesInsideParentheses": true,
+    "requireSpacesInsideObjectBrackets": "all",
+    "disallowDanglingUnderscores": true,
+    "disallowSpaceAfterObjectKeys": true,
+    "requireCommaBeforeLineBreak": true,
+    "requireOperatorBeforeLineBreak": [
+        "?",
+        "+",
+        "-",
+        "/",
+        "*",
+        "=",
+        "==",
+        "===",
+        "!=",
+        "!==",
+        ">",
+        ">=",
+        "<",
+        "<="
+    ],
+    "disallowLeftStickedOperators": [
+        "?",
+        "+",
+        "-",
+        "/",
+        "*",
+        "=",
+        "==",
+        "===",
+        "!=",
+        "!==",
+        ">",
+        ">=",
+        "<",
+        "<="
+    ],
+    "requireRightStickedOperators": ["!"],
+    "disallowRightStickedOperators": [
+        "?",
+        "+",
+        "/",
+        "*",
+        ":",
+        "=",
+        "==",
+        "===",
+        "!=",
+        "!==",
+        ">",
+        ">=",
+        "<",
+        "<="
+    ],
+    "requireLeftStickedOperators": [","],
+    "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+    "requireSpaceBeforeBinaryOperators": [
+        "+",
+        "-",
+        "/",
+        "*",
+        "=",
+        "==",
+        "===",
+        "!=",
+        "!=="
+    ],
+    "requireSpaceAfterBinaryOperators": [
+        "+",
+        "-",
+        "/",
+        "*",
+        "=",
+        "==",
+        "===",
+        "!=",
+        "!=="
+    ],
+    "disallowImplicitTypeConversion": ["numeric", "boolean", "binary", "string"],
+    "requireCamelCaseOrUpperCaseIdentifiers": true,
+    "disallowKeywords": ["with"],
+    "disallowMultipleLineStrings": true,
+    "validateLineBreaks": "LF",
+    "validateQuoteMarks": "'",
+    "disallowMixedSpacesAndTabs": true,
+    "disallowTrailingWhitespace": true,
+    "disallowKeywordsOnNewLine": ["else"],
+    "requireLineFeedAtFileEnd": true,
+    "requireDotNotation": true
+}
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/esprima.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/esprima.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/esprima.js	(revision 516)
@@ -243,17 +243,17 @@
 
     function isIdentifierStart(ch) {
-        return (ch === 36) || (ch === 95) ||  // $ (dollar) and _ (underscore)
-            (ch >= 65 && ch <= 90) ||         // A..Z
-            (ch >= 97 && ch <= 122) ||        // a..z
-            (ch === 92) ||                    // \ (backslash)
+        return (ch === 0x24) || (ch === 0x5F) ||  // $ (dollar) and _ (underscore)
+            (ch >= 0x41 && ch <= 0x5A) ||         // A..Z
+            (ch >= 0x61 && ch <= 0x7A) ||         // a..z
+            (ch === 0x5C) ||                      // \ (backslash)
             ((ch >= 0x80) && Regex.NonAsciiIdentifierStart.test(String.fromCharCode(ch)));
     }
 
     function isIdentifierPart(ch) {
-        return (ch === 36) || (ch === 95) ||  // $ (dollar) and _ (underscore)
-            (ch >= 65 && ch <= 90) ||         // A..Z
-            (ch >= 97 && ch <= 122) ||        // a..z
-            (ch >= 48 && ch <= 57) ||         // 0..9
-            (ch === 92) ||                    // \ (backslash)
+        return (ch === 0x24) || (ch === 0x5F) ||  // $ (dollar) and _ (underscore)
+            (ch >= 0x41 && ch <= 0x5A) ||         // A..Z
+            (ch >= 0x61 && ch <= 0x7A) ||         // a..z
+            (ch >= 0x30 && ch <= 0x39) ||         // 0..9
+            (ch === 0x5C) ||                      // \ (backslash)
             ((ch >= 0x80) && Regex.NonAsciiIdentifierPart.test(String.fromCharCode(ch)));
     }
@@ -431,5 +431,5 @@
             ch = source.charCodeAt(index);
             if (isLineTerminator(ch)) {
-                if (ch === 13 && source.charCodeAt(index + 1) === 10) {
+                if (ch === 0x0D && source.charCodeAt(index + 1) === 0x0A) {
                     ++index;
                 }
@@ -440,7 +440,7 @@
                     throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
                 }
-            } else if (ch === 42) {
-                // Block comment ends with '*/' (char #42, char #47).
-                if (source.charCodeAt(index + 1) === 47) {
+            } else if (ch === 0x2A) {
+                // Block comment ends with '*/'.
+                if (source.charCodeAt(index + 1) === 0x2F) {
                     ++index;
                     ++index;
@@ -475,5 +475,5 @@
             } else if (isLineTerminator(ch)) {
                 ++index;
-                if (ch === 13 && source.charCodeAt(index) === 10) {
+                if (ch === 0x0D && source.charCodeAt(index) === 0x0A) {
                     ++index;
                 }
@@ -481,12 +481,12 @@
                 lineStart = index;
                 start = true;
-            } else if (ch === 47) { // 47 is '/'
+            } else if (ch === 0x2F) { // U+002F is '/'
                 ch = source.charCodeAt(index + 1);
-                if (ch === 47) {
+                if (ch === 0x2F) {
                     ++index;
                     ++index;
                     skipSingleLineComment();
                     start = true;
-                } else if (ch === 42) {  // 42 is '*'
+                } else if (ch === 0x2A) {  // U+002A is '*'
                     ++index;
                     ++index;
@@ -495,7 +495,7 @@
                     break;
                 }
-            } else if (start && ch === 45) { // 45 is '-'
-                // 62 is '>'
-                if ((source.charCodeAt(index + 1) === 45) && (source.charCodeAt(index + 2) === 62)) {
+            } else if (start && ch === 0x2D) { // U+002D is '-'
+                // U+003E is '>'
+                if ((source.charCodeAt(index + 1) === 0x2D) && (source.charCodeAt(index + 2) === 0x3E)) {
                     // '-->' is a single-line comment
                     index += 3;
@@ -504,5 +504,5 @@
                     break;
                 }
-            } else if (ch === 60) { // 60 is '<'
+            } else if (ch === 0x3C) { // U+003C is '<'
                 if (source.slice(index + 1, index + 4) === '!--') {
                     ++index; // `<`
@@ -541,7 +541,7 @@
         id = String.fromCharCode(ch);
 
-        // '\u' (char #92, char #117) denotes an escaped character.
-        if (ch === 92) {
-            if (source.charCodeAt(index) !== 117) {
+        // '\u' (U+005C, U+0075) denotes an escaped character.
+        if (ch === 0x5C) {
+            if (source.charCodeAt(index) !== 0x75) {
                 throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
             }
@@ -562,8 +562,8 @@
             id += String.fromCharCode(ch);
 
-            // '\u' (char #92, char #117) denotes an escaped character.
-            if (ch === 92) {
+            // '\u' (U+005C, U+0075) denotes an escaped character.
+            if (ch === 0x5C) {
                 id = id.substr(0, id.length - 1);
-                if (source.charCodeAt(index) !== 117) {
+                if (source.charCodeAt(index) !== 0x75) {
                     throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
                 }
@@ -586,6 +586,6 @@
         while (index < length) {
             ch = source.charCodeAt(index);
-            if (ch === 92) {
-                // Blackslash (char #92) marks Unicode escape sequence.
+            if (ch === 0x5C) {
+                // Blackslash (U+005C) marks Unicode escape sequence.
                 index = start;
                 return getEscapedIdentifier();
@@ -606,6 +606,6 @@
         start = index;
 
-        // Backslash (char #92) starts an escaped character.
-        id = (source.charCodeAt(index) === 92) ? getEscapedIdentifier() : getIdentifier();
+        // Backslash (U+005C) starts an escaped character.
+        id = (source.charCodeAt(index) === 0x5C) ? getEscapedIdentifier() : getIdentifier();
 
         // There is no keyword or literal with only one character.
@@ -647,21 +647,21 @@
 
         // Check for most common single-character punctuators.
-        case 46:   // . dot
-        case 40:   // ( open bracket
-        case 41:   // ) close bracket
-        case 59:   // ; semicolon
-        case 44:   // , comma
-        case 123:  // { open curly brace
-        case 125:  // } close curly brace
-        case 91:   // [
-        case 93:   // ]
-        case 58:   // :
-        case 63:   // ?
-        case 126:  // ~
+        case 0x2E:  // . dot
+        case 0x28:  // ( open bracket
+        case 0x29:  // ) close bracket
+        case 0x3B:  // ; semicolon
+        case 0x2C:  // , comma
+        case 0x7B:  // { open curly brace
+        case 0x7D:  // } close curly brace
+        case 0x5B:  // [
+        case 0x5D:  // ]
+        case 0x3A:  // :
+        case 0x3F:  // ?
+        case 0x7E:  // ~
             ++index;
             if (extra.tokenize) {
-                if (code === 40) {
+                if (code === 0x28) {
                     extra.openParenToken = extra.tokens.length;
-                } else if (code === 123) {
+                } else if (code === 0x7B) {
                     extra.openCurlyToken = extra.tokens.length;
                 }
@@ -678,17 +678,17 @@
             code2 = source.charCodeAt(index + 1);
 
-            // '=' (char #61) marks an assignment or comparison operator.
-            if (code2 === 61) {
+            // '=' (U+003D) marks an assignment or comparison operator.
+            if (code2 === 0x3D) {
                 switch (code) {
-                case 37:  // %
-                case 38:  // &
-                case 42:  // *:
-                case 43:  // +
-                case 45:  // -
-                case 47:  // /
-                case 60:  // <
-                case 62:  // >
-                case 94:  // ^
-                case 124: // |
+                case 0x25:  // %
+                case 0x26:  // &
+                case 0x2A:  // *:
+                case 0x2B:  // +
+                case 0x2D:  // -
+                case 0x2F:  // /
+                case 0x3C:  // <
+                case 0x3E:  // >
+                case 0x5E:  // ^
+                case 0x7C:  // |
                     index += 2;
                     return {
@@ -700,10 +700,10 @@
                     };
 
-                case 33: // !
-                case 61: // =
+                case 0x21: // !
+                case 0x3D: // =
                     index += 2;
 
                     // !== and ===
-                    if (source.charCodeAt(index) === 61) {
+                    if (source.charCodeAt(index) === 0x3D) {
                         ++index;
                     }
@@ -1262,10 +1262,10 @@
 
         // Very common: ( and ) and ;
-        if (ch === 40 || ch === 41 || ch === 58) {
+        if (ch === 0x28 || ch === 0x29 || ch === 0x3A) {
             return scanPunctuator();
         }
 
-        // String literal starts with single quote (#39) or double quote (#34).
-        if (ch === 39 || ch === 34) {
+        // String literal starts with single quote (U+0027) or double quote (U+0022).
+        if (ch === 0x27 || ch === 0x22) {
             return scanStringLiteral();
         }
@@ -1275,7 +1275,7 @@
         }
 
-        // Dot (.) char #46 can also start a floating-point number, hence the need
+        // Dot (.) U+002E can also start a floating-point number, hence the need
         // to check the next character.
-        if (ch === 46) {
+        if (ch === 0x2E) {
             if (isDecimalDigit(source.charCodeAt(index + 1))) {
                 return scanNumericLiteral();
@@ -1288,6 +1288,6 @@
         }
 
-        // Slash (/) char #47 can also start a regex.
-        if (extra.tokenize && ch === 47) {
+        // Slash (/) U+002F can also start a regex.
+        if (extra.tokenize && ch === 0x2F) {
             return advanceSlash();
         }
@@ -1935,6 +1935,6 @@
         var line;
 
-        // Catch the very common case first: immediately a semicolon (char #59).
-        if (source.charCodeAt(index) === 59) {
+        // Catch the very common case first: immediately a semicolon (U+003B).
+        if (source.charCodeAt(index) === 0x3B) {
             lex();
             return;
@@ -2893,5 +2893,5 @@
 
         // Optimize the most common form: 'continue;'.
-        if (source.charCodeAt(index) === 59) {
+        if (source.charCodeAt(index) === 0x3B) {
             lex();
 
@@ -2936,6 +2936,6 @@
         expectKeyword('break');
 
-        // Catch the very common case first: immediately a semicolon (char #59).
-        if (source.charCodeAt(index) === 59) {
+        // Catch the very common case first: immediately a semicolon (U+003B).
+        if (source.charCodeAt(index) === 0x3B) {
             lex();
 
@@ -2985,5 +2985,5 @@
 
         // 'return' followed by a space and an identifier is very common.
-        if (source.charCodeAt(index) === 32) {
+        if (source.charCodeAt(index) === 0x20) {
             if (isIdentifierStart(source.charCodeAt(index + 1))) {
                 argument = parseExpression();
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/package.json	(revision 516)
@@ -23,4 +23,7 @@
     "url": "http://github.com/ariya/esprima.git"
   },
+  "bugs": {
+    "url": "http://issues.esprima.org"
+  },
   "licenses": [
     {
@@ -31,9 +34,12 @@
   "devDependencies": {
     "jslint": "~0.1.9",
-    "eslint": "~0.1.0",
+    "eslint": "~0.3.0",
+    "jscs": "~1.2.4",
     "istanbul": "~0.1.27",
     "complexity-report": "~0.6.1",
     "regenerate": "~0.5.4",
-    "unicode-6.3.0": "~0.1.0"
+    "unicode-6.3.0": "~0.1.0",
+    "json-diff": "~0.3.1",
+    "optimist": "~0.6.0"
   },
   "keywords": [
@@ -47,5 +53,9 @@
     "generate-regex": "node tools/generate-identifier-regex.js",
     "test": "npm run-script lint && node test/run.js && npm run-script coverage && npm run-script complexity",
-    "lint": "node tools/check-version.js && node_modules/eslint/bin/eslint.js esprima.js && node_modules/jslint/bin/jslint.js esprima.js",
+    "lint": "npm run-script check-version && npm run-script eslint && npm run-script jscs && npm run-script jslint",
+    "check-version": "node tools/check-version.js",
+    "eslint": "node node_modules/eslint/bin/eslint.js esprima.js",
+    "jscs": "node node_modules/.bin/jscs esprima.js",
+    "jslint": "node node_modules/jslint/bin/jslint.js esprima.js",
     "coverage": "npm run-script analyze-coverage && npm run-script check-coverage",
     "analyze-coverage": "node node_modules/istanbul/lib/cli.js cover test/runner.js",
@@ -59,10 +69,7 @@
   "readme": "**Esprima** ([esprima.org](http://esprima.org), BSD license) is a high performance,\nstandard-compliant [ECMAScript](http://www.ecma-international.org/publications/standards/Ecma-262.htm)\nparser written in ECMAScript (also popularly known as\n[JavaScript](http://en.wikipedia.org/wiki/JavaScript>JavaScript)).\nEsprima is created and maintained by [Ariya Hidayat](http://twitter.com/ariyahidayat),\nwith the help of [many contributors](https://github.com/ariya/esprima/contributors).\n\n### Features\n\n- Full support for ECMAScript 5.1 ([ECMA-262](http://www.ecma-international.org/publications/standards/Ecma-262.htm))\n- Sensible [syntax tree format](http://esprima.org/doc/index.html#ast) compatible with Mozilla\n[Parser AST](https://developer.mozilla.org/en/SpiderMonkey/Parser_API)\n- Optional tracking of syntax node location (index-based and line-column)\n- Heavily tested (> 600 [unit tests](http://esprima.org/test/) with solid statement and branch coverage)\n- Experimental support for ES6/Harmony (module, class, destructuring, ...)\n\nEsprima serves as a **building block** for some JavaScript\nlanguage tools, from [code instrumentation](http://esprima.org/demo/functiontrace.html)\nto [editor autocompletion](http://esprima.org/demo/autocomplete.html).\n\nEsprima runs on many popular web browsers, as well as other ECMAScript platforms such as\n[Rhino](http://www.mozilla.org/rhino) and [Node.js](https://npmjs.org/package/esprima).\n\nFor more information, check the web site [esprima.org](http://esprima.org).\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/ariya/esprima/issues"
-  },
   "_id": "esprima@1.1.0-dev",
   "dist": {
-    "shasum": "ae2e2124f41c4b23d858b820ebc75fccb1982219"
+    "shasum": "b2624b515cd299ba33f1f2499fbf40b742ead616"
   },
   "_from": "https://github.com/ariya/esprima/tarball/master",
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/benchmarks.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/benchmarks.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/benchmarks.js	(revision 516)
@@ -33,16 +33,16 @@
 fullFixture = [
     'Underscore 1.5.2',
-    'Backbone 1.0.0',
+    'Backbone 1.1.0',
     'MooTools 1.4.5',
     'jQuery 1.9.1',
     'YUI 3.12.0',
     'jQuery.Mobile 1.3.2',
-    'Angular 1.0.8'
+    'Angular 1.2.5'
 ];
 
 quickFixture = [
-    'Backbone 1.0.0',
+    'Backbone 1.1.0',
     'jQuery 1.9.1',
-    'Angular 1.0.6'
+    'Angular 1.2.5'
 ];
 
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/compare.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/compare.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/compare.js	(revision 516)
@@ -40,5 +40,5 @@
 fixtureList = [
     'Underscore 1.5.2',
-    'Backbone 1.0.0',
+    'Backbone 1.1.0',
     'jQuery 1.9.1'
 ];
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/parselibs.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/parselibs.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/parselibs.js	(revision 516)
@@ -30,10 +30,10 @@
 fixture = [
     'Underscore 1.5.2',
-    'Backbone 1.0.0',
+    'Backbone 1.1.0',
     'MooTools 1.4.5',
     'jQuery 1.9.1',
     'YUI 3.12.0',
     'jQuery.Mobile 1.3.2',
-    'Angular 1.0.8'
+    'Angular 1.2.5'
 ];
 
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/runner.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/runner.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/esprima/test/runner.js	(revision 516)
@@ -418,4 +418,5 @@
             vm = require('vm'),
             fs = require('fs'),
+            diff = require('json-diff').diffString,
             total = 0,
             failures = [],
@@ -445,7 +446,17 @@
             console.error(header);
             failures.forEach(function (failure) {
-                console.error(failure.source + ': Expected\n    ' +
-                    failure.expected.split('\n').join('\n    ') +
-                    '\nto match\n    ' + failure.actual);
+                try {
+                    var expectedObject = JSON.parse(failure.expected);
+                    var actualObject = JSON.parse(failure.actual);
+
+                    console.error(failure.source + ': Expected\n    ' +
+                        failure.expected.split('\n').join('\n    ') +
+                        '\nto match\n    ' + failure.actual + '\nDiff:\n' +
+                        diff(expectedObject, actualObject));
+                } catch (ex) {
+                    console.error(failure.source + ': Expected\n    ' +
+                        failure.expected.split('\n').join('\n    ') +
+                        '\nto match\n    ' + failure.actual);
+                }
             });
         } else {
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/.npmignore
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/.npmignore	(revision 516)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/.npmignore	(revision 516)
@@ -0,0 +1,1 @@
+node_modules
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/README.md
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/README.md	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/README.md	(revision 516)
@@ -20,4 +20,5 @@
 minimatch("bar.foo", "*.foo") // true!
 minimatch("bar.foo", "*.bar") // false!
+minimatch("bar.foo", "*.+(bar|foo)", { debug: true }) // true, and noisy!
 ```
 
@@ -36,42 +37,4 @@
 * `man 3 fnmatch`
 * `man 5 gitignore`
-
-### Comparisons to other fnmatch/glob implementations
-
-While strict compliance with the existing standards is a worthwhile
-goal, some discrepancies exist between minimatch and other
-implementations, and are intentional.
-
-If the pattern starts with a `!` character, then it is negated.  Set the
-`nonegate` flag to suppress this behavior, and treat leading `!`
-characters normally.  This is perhaps relevant if you wish to start the
-pattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`
-characters at the start of a pattern will negate the pattern multiple
-times.
-
-If a pattern starts with `#`, then it is treated as a comment, and
-will not match anything.  Use `\#` to match a literal `#` at the
-start of a line, or set the `nocomment` flag to suppress this behavior.
-
-The double-star character `**` is supported by default, unless the
-`noglobstar` flag is set.  This is supported in the manner of bsdglob
-and bash 4.1, where `**` only has special significance if it is the only
-thing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but
-`a/**b` will not.  **Note that this is different from the way that `**` is
-handled by ruby's `Dir` class.**
-
-If an escaped pattern has no matches, and the `nonull` flag is set,
-then minimatch.match returns the pattern as-provided, rather than
-interpreting the character escapes.  For example,
-`minimatch.match([], "\\*a\\?")` will return `"\\*a\\?"` rather than
-`"*a?"`.  This is akin to setting the `nullglob` option in bash, except
-that it does not resolve escaped pattern characters.
-
-If brace expansion is not disabled, then it is performed before any
-other interpretation of the glob pattern.  Thus, a pattern like
-`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded
-**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are
-checked for validity.  Since those two are valid, matching proceeds.
-
 
 ## Minimatch Class
@@ -217,2 +180,39 @@
 Returns from negate expressions the same as if they were not negated.
 (Ie, true on a hit, false on a miss.)
+
+
+## Comparisons to other fnmatch/glob implementations
+
+While strict compliance with the existing standards is a worthwhile
+goal, some discrepancies exist between minimatch and other
+implementations, and are intentional.
+
+If the pattern starts with a `!` character, then it is negated.  Set the
+`nonegate` flag to suppress this behavior, and treat leading `!`
+characters normally.  This is perhaps relevant if you wish to start the
+pattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`
+characters at the start of a pattern will negate the pattern multiple
+times.
+
+If a pattern starts with `#`, then it is treated as a comment, and
+will not match anything.  Use `\#` to match a literal `#` at the
+start of a line, or set the `nocomment` flag to suppress this behavior.
+
+The double-star character `**` is supported by default, unless the
+`noglobstar` flag is set.  This is supported in the manner of bsdglob
+and bash 4.1, where `**` only has special significance if it is the only
+thing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but
+`a/**b` will not.
+
+If an escaped pattern has no matches, and the `nonull` flag is set,
+then minimatch.match returns the pattern as-provided, rather than
+interpreting the character escapes.  For example,
+`minimatch.match([], "\\*a\\?")` will return `"\\*a\\?"` rather than
+`"*a?"`.  This is akin to setting the `nullglob` option in bash, except
+that it does not resolve escaped pattern characters.
+
+If brace expansion is not disabled, then it is performed before any
+other interpretation of the glob pattern.  Thus, a pattern like
+`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded
+**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are
+checked for validity.  Since those two are valid, matching proceeds.
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/minimatch.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/minimatch.js	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/minimatch.js	(revision 516)
@@ -69,15 +69,4 @@
 var slashSplit = /\/+/
 
-minimatch.monkeyPatch = monkeyPatch
-function monkeyPatch () {
-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "match")
-  var orig = desc.value
-  desc.value = function (p) {
-    if (p instanceof Minimatch) return p.match(this)
-    return orig.call(this, p)
-  }
-  Object.defineProperty(String.prototype, desc)
-}
-
 minimatch.filter = filter
 function filter (pattern, options) {
@@ -179,4 +168,6 @@
 }
 
+Minimatch.prototype.debug = function() {}
+
 Minimatch.prototype.make = make
 function make () {
@@ -203,5 +194,7 @@
   var set = this.globSet = this.braceExpand()
 
-  if (options.debug) console.error(this.pattern, set)
+  if (options.debug) this.debug = console.error
+
+  this.debug(this.pattern, set)
 
   // step 3: now we have a set, so turn each one into a series of path-portion
@@ -214,5 +207,5 @@
   })
 
-  if (options.debug) console.error(this.pattern, set)
+  this.debug(this.pattern, set)
 
   // glob --> regexps
@@ -221,5 +214,5 @@
   }, this)
 
-  if (options.debug) console.error(this.pattern, set)
+  this.debug(this.pattern, set)
 
   // filter out everything that didn't compile properly.
@@ -228,5 +221,5 @@
   })
 
-  if (options.debug) console.error(this.pattern, set)
+  this.debug(this.pattern, set)
 
   this.set = set
@@ -303,9 +296,9 @@
   // and then prepend it to everything we find.
   if (pattern.charAt(0) !== "{") {
-    // console.error(pattern)
+    this.debug(pattern)
     var prefix = null
     for (var i = 0, l = pattern.length; i < l; i ++) {
       var c = pattern.charAt(i)
-      // console.error(i, c)
+      this.debug(i, c)
       if (c === "\\") {
         escaping = !escaping
@@ -318,9 +311,9 @@
     // actually no sets, all { were escaped.
     if (prefix === null) {
-      // console.error("no sets")
+      this.debug("no sets")
       return [pattern]
     }
 
-    var tail = braceExpand(pattern.substr(i), options)
+   var tail = braceExpand.call(this, pattern.substr(i), options)
     return tail.map(function (t) {
       return prefix + t
@@ -337,6 +330,6 @@
   var numset = pattern.match(/^\{(-?[0-9]+)\.\.(-?[0-9]+)\}/)
   if (numset) {
-    // console.error("numset", numset[1], numset[2])
-    var suf = braceExpand(pattern.substr(numset[0].length), options)
+    this.debug("numset", numset[1], numset[2])
+    var suf = braceExpand.call(this, pattern.substr(numset[0].length), options)
       , start = +numset[1]
       , end = +numset[2]
@@ -370,8 +363,8 @@
   }
 
-  // console.error("Entering for")
+  this.debug("Entering for")
   FOR: for (i = 1, l = pattern.length; i < l; i ++) {
     var c = pattern.charAt(i)
-    // console.error("", i, c)
+    this.debug("", i, c)
 
     if (escaping) {
@@ -421,20 +414,20 @@
   // and need to escape the leading brace
   if (depth !== 0) {
-    // console.error("didn't close", pattern)
-    return braceExpand("\\" + pattern, options)
+    this.debug("didn't close", pattern)
+    return braceExpand.call(this, "\\" + pattern, options)
   }
 
   // x{y,z} -> ["xy", "xz"]
-  // console.error("set", set)
-  // console.error("suffix", pattern.substr(i))
-  var suf = braceExpand(pattern.substr(i), options)
+  this.debug("set", set)
+  this.debug("suffix", pattern.substr(i))
+  var suf = braceExpand.call(this, pattern.substr(i), options)
   // ["b", "c{d,e}","{f,g}h"] ->
   //   [["b"], ["cd", "ce"], ["fh", "gh"]]
   var addBraces = set.length === 1
-  // console.error("set pre-expanded", set)
+  this.debug("set pre-expanded", set)
   set = set.map(function (p) {
-    return braceExpand(p, options)
-  })
-  // console.error("set expanded", set)
+    return braceExpand.call(this, p, options)
+  }, this)
+  this.debug("set expanded", set)
 
 
@@ -497,4 +490,5 @@
       : options.dot ? "(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))"
       : "(?!\\.)"
+    , self = this
 
   function clearStateChar () {
@@ -515,4 +509,5 @@
           break
       }
+      self.debug('clearStateChar %j %j', stateChar, re)
       stateChar = false
     }
@@ -523,7 +518,5 @@
       ; i ++ ) {
 
-    if (options.debug) {
-      console.error("%s\t%s %s %j", pattern, i, re, c)
-    }
+    this.debug("%s\t%s %s %j", pattern, i, re, c)
 
     // skip over any that are escaped.
@@ -552,11 +545,10 @@
       case "@":
       case "!":
-        if (options.debug) {
-          console.error("%s\t%s %s %j <-- stateChar", pattern, i, re, c)
-        }
+        this.debug("%s\t%s %s %j <-- stateChar", pattern, i, re, c)
 
         // all of those are literals inside a class, except that
         // the glob [!a] means [^a] in regexp
         if (inClass) {
+          this.debug('  in class')
           if (c === "!" && i === classStart + 1) c = "^"
           re += c
@@ -567,4 +559,5 @@
         // that there was something like ** or +? in there.
         // Handle the stateChar, then proceed with this one.
+        self.debug('call clearStateChar %j', stateChar)
         clearStateChar()
         stateChar = c
@@ -592,4 +585,5 @@
         // negation is (?:(?!js)[^/]*)
         re += stateChar === "!" ? "(?:(?!" : "(?:"
+        this.debug('plType %j %j', stateChar, re)
         stateChar = false
         continue
@@ -601,4 +595,5 @@
         }
 
+        clearStateChar()
         hasMagic = true
         re += ")"
@@ -624,4 +619,5 @@
         }
 
+        clearStateChar()
         re += "|"
         continue
@@ -716,5 +712,5 @@
     })
 
-    // console.error("tail=%j\n   %s", tail, tail)
+    this.debug("tail=%j\n   %s", tail, tail)
     var t = pl.type === "*" ? star
           : pl.type === "?" ? qmark
@@ -830,5 +826,5 @@
 Minimatch.prototype.match = match
 function match (f, partial) {
-  // console.error("match", f, this.pattern)
+  this.debug("match", f, this.pattern)
   // short-circuit in the case of busted things.
   // comments, etc.
@@ -848,7 +844,5 @@
   // treat the test path as a set of pathparts.
   f = f.split(slashSplit)
-  if (options.debug) {
-    console.error(this.pattern, "split", f)
-  }
+  this.debug(this.pattern, "split", f)
 
   // just ONE of the pattern sets in this.set needs to match
@@ -858,9 +852,14 @@
 
   var set = this.set
-  // console.error(this.pattern, "set", set)
+  this.debug(this.pattern, "set", set)
+
+  var splitFile = path.basename(f.join("/")).split("/")
 
   for (var i = 0, l = set.length; i < l; i ++) {
-    var pattern = set[i]
-    var hit = this.matchOne(f, pattern, partial)
+    var pattern = set[i], file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = splitFile
+    }
+    var hit = this.matchOne(file, pattern, partial)
     if (hit) {
       if (options.flipNegate) return true
@@ -883,18 +882,10 @@
   var options = this.options
 
-  if (options.debug) {
-    console.error("matchOne",
-                  { "this": this
-                  , file: file
-                  , pattern: pattern })
-  }
-
-  if (options.matchBase && pattern.length === 1) {
-    file = path.basename(file.join("/")).split("/")
-  }
-
-  if (options.debug) {
-    console.error("matchOne", file.length, pattern.length)
-  }
+  this.debug("matchOne",
+              { "this": this
+              , file: file
+              , pattern: pattern })
+
+  this.debug("matchOne", file.length, pattern.length)
 
   for ( var fi = 0
@@ -905,13 +896,9 @@
       ; fi ++, pi ++ ) {
 
-    if (options.debug) {
-      console.error("matchOne loop")
-    }
+    this.debug("matchOne loop")
     var p = pattern[pi]
       , f = file[fi]
 
-    if (options.debug) {
-      console.error(pattern, p, f)
-    }
+    this.debug(pattern, p, f)
 
     // should be impossible.
@@ -920,6 +907,5 @@
 
     if (p === GLOBSTAR) {
-      if (options.debug)
-        console.error('GLOBSTAR', [pattern, p, f])
+      this.debug('GLOBSTAR', [pattern, p, f])
 
       // "**"
@@ -948,6 +934,5 @@
         , pr = pi + 1
       if (pr === pl) {
-        if (options.debug)
-          console.error('** at the end')
+        this.debug('** at the end')
         // a ** at the end will just swallow the rest.
         // We have found a match.
@@ -967,13 +952,10 @@
         var swallowee = file[fr]
 
-        if (options.debug) {
-          console.error('\nglobstar while',
-                        file, fr, pattern, pr, swallowee)
-        }
+        this.debug('\nglobstar while',
+                    file, fr, pattern, pr, swallowee)
 
         // XXX remove this slice.  Just pass the start index.
         if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
-          if (options.debug)
-            console.error('globstar found match!', fr, fl, swallowee)
+          this.debug('globstar found match!', fr, fl, swallowee)
           // found a match.
           return true
@@ -983,12 +965,10 @@
           if (swallowee === "." || swallowee === ".." ||
               (!options.dot && swallowee.charAt(0) === ".")) {
-            if (options.debug)
-              console.error("dot detected!", file, fr, pattern, pr)
+            this.debug("dot detected!", file, fr, pattern, pr)
             break WHILE
           }
 
           // ** swallows a segment, and continue.
-          if (options.debug)
-            console.error('globstar swallow a segment, and continue')
+          this.debug('globstar swallow a segment, and continue')
           fr ++
         }
@@ -999,5 +979,5 @@
       if (partial) {
         // ran out of file
-        // console.error("\n>>> no match, partial?", file, fr, pattern, pr)
+        this.debug("\n>>> no match, partial?", file, fr, pattern, pr)
         if (fr === fl) return true
       }
@@ -1015,12 +995,8 @@
         hit = f === p
       }
-      if (options.debug) {
-        console.error("string match", p, f, hit)
-      }
+      this.debug("string match", p, f, hit)
     } else {
       hit = f.match(p)
-      if (options.debug) {
-        console.error("pattern match", p, f, hit)
-      }
+      this.debug("pattern match", p, f, hit)
     }
 
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json	(revision 516)
@@ -30,8 +30,4 @@
   "homepage": "https://github.com/isaacs/node-lru-cache",
   "_id": "lru-cache@2.5.0",
-  "dist": {
-    "shasum": "be07d09e5b05f10b83d0cf01d4891a7729288c69"
-  },
-  "_from": "lru-cache@2",
-  "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+  "_from": "lru-cache@2"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/node_modules/sigmund/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/node_modules/sigmund/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/node_modules/sigmund/package.json	(revision 516)
@@ -39,8 +39,4 @@
   "homepage": "https://github.com/isaacs/sigmund",
   "_id": "sigmund@1.0.0",
-  "_from": "sigmund@~1.0.0",
-  "dist": {
-    "shasum": "4d1a782fdcf140509fd8ea166574e0665819b881"
-  },
-  "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+  "_from": "sigmund@~1.0.0"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/package.json	(revision 516)
@@ -7,5 +7,5 @@
   "name": "minimatch",
   "description": "a glob matcher in javascript",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "repository": {
     "type": "git",
@@ -14,5 +14,5 @@
   "main": "minimatch.js",
   "scripts": {
-    "test": "tap test"
+    "test": "tap test/*.js"
   },
   "engines": {
@@ -30,5 +30,5 @@
     "url": "http://github.com/isaacs/minimatch/raw/master/LICENSE"
   },
-  "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nEventually, it will replace the C binding in node-glob.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\n```\n\n## Features\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n\n### Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between minimatch and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated.  Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally.  This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything.  Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set.  This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.  **Note that this is different from the way that `**` is\nhandled by ruby's `Dir` class.**\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen minimatch.match returns the pattern as-provided, rather than\ninterpreting the character escapes.  For example,\n`minimatch.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`.  This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern.  Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity.  Since those two are valid, matching proceeds.\n\n\n## Minimatch Class\n\nCreate a minimatch object by instanting the `minimatch.Minimatch` class.\n\n```javascript\nvar Minimatch = require(\"minimatch\").Minimatch\nvar mm = new Minimatch(pattern, options)\n```\n\n### Properties\n\n* `pattern` The original pattern the minimatch object represents.\n* `options` The options supplied to the constructor.\n* `set` A 2-dimensional array of regexp or string expressions.\n  Each row in the\n  array corresponds to a brace-expanded pattern.  Each item in the row\n  corresponds to a single path-part.  For example, the pattern\n  `{a,b/c}/d` would expand to a set of patterns like:\n\n        [ [ a, d ]\n        , [ b, c, d ] ]\n\n    If a portion of the pattern doesn't have any \"magic\" in it\n    (that is, it's something like `\"foo\"` rather than `fo*o?`), then it\n    will be left as a string rather than converted to a regular\n    expression.\n\n* `regexp` Created by the `makeRe` method.  A single regular expression\n  expressing the entire pattern.  This is useful in cases where you wish\n  to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.\n* `negate` True if the pattern is negated.\n* `comment` True if the pattern is a comment.\n* `empty` True if the pattern is `\"\"`.\n\n### Methods\n\n* `makeRe` Generate the `regexp` member if necessary, and return it.\n  Will return `false` if the pattern is invalid.\n* `match(fname)` Return true if the filename matches the pattern, or\n  false otherwise.\n* `matchOne(fileArray, patternArray, partial)` Take a `/`-split\n  filename, and match it against a single row in the `regExpSet`.  This\n  method is mainly for internal use, but is exposed so that it can be\n  used by a glob-walker that needs to avoid excessive filesystem calls.\n\nAll other methods are internal, and will be called as necessary.\n\n## Functions\n\nThe top-level exported function has a `cache` property, which is an LRU\ncache set to store 100 items.  So, calling these methods repeatedly\nwith the same pattern and options will use the same Minimatch object,\nsaving the cost of parsing it multiple times.\n\n### minimatch(path, pattern, options)\n\nMain export.  Tests a path against the pattern using the options.\n\n```javascript\nvar isJS = minimatch(file, \"*.js\", { matchBase: true })\n```\n\n### minimatch.filter(pattern, options)\n\nReturns a function that tests its\nsupplied argument, suitable for use with `Array.filter`.  Example:\n\n```javascript\nvar javascripts = fileList.filter(minimatch.filter(\"*.js\", {matchBase: true}))\n```\n\n### minimatch.match(list, pattern, options)\n\nMatch against the list of\nfiles, in the style of fnmatch or glob.  If nothing is matched, and\noptions.nonull is set, then return a list containing the pattern itself.\n\n```javascript\nvar javascripts = minimatch.match(fileList, \"*.js\", {matchBase: true}))\n```\n\n### minimatch.makeRe(pattern, options)\n\nMake a regular expression object from the pattern.\n\n## Options\n\nAll options are `false` by default.\n\n### debug\n\nDump a ton of stuff to stderr.\n\n### nobrace\n\nDo not expand `{a,b}` and `{1..3}` brace sets.\n\n### noglobstar\n\nDisable `**` matching against multiple folder names.\n\n### dot\n\nAllow patterns to match filenames starting with a period, even if\nthe pattern does not explicitly have a period in that spot.\n\nNote that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`\nis set.\n\n### noext\n\nDisable \"extglob\" style patterns like `+(a|b)`.\n\n### nocase\n\nPerform a case-insensitive match.\n\n### nonull\n\nWhen a match is not found by `minimatch.match`, return a list containing\nthe pattern itself.  When set, an empty list is returned if there are\nno matches.\n\n### matchBase\n\nIf set, then patterns without slashes will be matched\nagainst the basename of the path if it contains slashes.  For example,\n`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.\n\n### nocomment\n\nSuppress the behavior of treating `#` at the start of a pattern as a\ncomment.\n\n### nonegate\n\nSuppress the behavior of treating a leading `!` character as negation.\n\n### flipNegate\n\nReturns from negate expressions the same as if they were not negated.\n(Ie, true on a hit, false on a miss.)\n",
+  "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nEventually, it will replace the C binding in node-glob.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\nminimatch(\"bar.foo\", \"*.+(bar|foo)\", { debug: true }) // true, and noisy!\n```\n\n## Features\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n\n## Minimatch Class\n\nCreate a minimatch object by instanting the `minimatch.Minimatch` class.\n\n```javascript\nvar Minimatch = require(\"minimatch\").Minimatch\nvar mm = new Minimatch(pattern, options)\n```\n\n### Properties\n\n* `pattern` The original pattern the minimatch object represents.\n* `options` The options supplied to the constructor.\n* `set` A 2-dimensional array of regexp or string expressions.\n  Each row in the\n  array corresponds to a brace-expanded pattern.  Each item in the row\n  corresponds to a single path-part.  For example, the pattern\n  `{a,b/c}/d` would expand to a set of patterns like:\n\n        [ [ a, d ]\n        , [ b, c, d ] ]\n\n    If a portion of the pattern doesn't have any \"magic\" in it\n    (that is, it's something like `\"foo\"` rather than `fo*o?`), then it\n    will be left as a string rather than converted to a regular\n    expression.\n\n* `regexp` Created by the `makeRe` method.  A single regular expression\n  expressing the entire pattern.  This is useful in cases where you wish\n  to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.\n* `negate` True if the pattern is negated.\n* `comment` True if the pattern is a comment.\n* `empty` True if the pattern is `\"\"`.\n\n### Methods\n\n* `makeRe` Generate the `regexp` member if necessary, and return it.\n  Will return `false` if the pattern is invalid.\n* `match(fname)` Return true if the filename matches the pattern, or\n  false otherwise.\n* `matchOne(fileArray, patternArray, partial)` Take a `/`-split\n  filename, and match it against a single row in the `regExpSet`.  This\n  method is mainly for internal use, but is exposed so that it can be\n  used by a glob-walker that needs to avoid excessive filesystem calls.\n\nAll other methods are internal, and will be called as necessary.\n\n## Functions\n\nThe top-level exported function has a `cache` property, which is an LRU\ncache set to store 100 items.  So, calling these methods repeatedly\nwith the same pattern and options will use the same Minimatch object,\nsaving the cost of parsing it multiple times.\n\n### minimatch(path, pattern, options)\n\nMain export.  Tests a path against the pattern using the options.\n\n```javascript\nvar isJS = minimatch(file, \"*.js\", { matchBase: true })\n```\n\n### minimatch.filter(pattern, options)\n\nReturns a function that tests its\nsupplied argument, suitable for use with `Array.filter`.  Example:\n\n```javascript\nvar javascripts = fileList.filter(minimatch.filter(\"*.js\", {matchBase: true}))\n```\n\n### minimatch.match(list, pattern, options)\n\nMatch against the list of\nfiles, in the style of fnmatch or glob.  If nothing is matched, and\noptions.nonull is set, then return a list containing the pattern itself.\n\n```javascript\nvar javascripts = minimatch.match(fileList, \"*.js\", {matchBase: true}))\n```\n\n### minimatch.makeRe(pattern, options)\n\nMake a regular expression object from the pattern.\n\n## Options\n\nAll options are `false` by default.\n\n### debug\n\nDump a ton of stuff to stderr.\n\n### nobrace\n\nDo not expand `{a,b}` and `{1..3}` brace sets.\n\n### noglobstar\n\nDisable `**` matching against multiple folder names.\n\n### dot\n\nAllow patterns to match filenames starting with a period, even if\nthe pattern does not explicitly have a period in that spot.\n\nNote that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`\nis set.\n\n### noext\n\nDisable \"extglob\" style patterns like `+(a|b)`.\n\n### nocase\n\nPerform a case-insensitive match.\n\n### nonull\n\nWhen a match is not found by `minimatch.match`, return a list containing\nthe pattern itself.  When set, an empty list is returned if there are\nno matches.\n\n### matchBase\n\nIf set, then patterns without slashes will be matched\nagainst the basename of the path if it contains slashes.  For example,\n`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.\n\n### nocomment\n\nSuppress the behavior of treating `#` at the start of a pattern as a\ncomment.\n\n### nonegate\n\nSuppress the behavior of treating a leading `!` character as negation.\n\n### flipNegate\n\nReturns from negate expressions the same as if they were not negated.\n(Ie, true on a hit, false on a miss.)\n\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between minimatch and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated.  Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally.  This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything.  Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set.  This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen minimatch.match returns the pattern as-provided, rather than\ninterpreting the character escapes.  For example,\n`minimatch.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`.  This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern.  Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity.  Since those two are valid, matching proceeds.\n",
   "readmeFilename": "README.md",
   "bugs": {
@@ -36,5 +36,5 @@
   },
   "homepage": "https://github.com/isaacs/minimatch",
-  "_id": "minimatch@0.2.12",
+  "_id": "minimatch@0.2.14",
   "_from": "minimatch@0.x.x"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/test/extglob-ending-with-state-char.js
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/test/extglob-ending-with-state-char.js	(revision 516)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/minimatch/test/extglob-ending-with-state-char.js	(revision 516)
@@ -0,0 +1,8 @@
+var test = require('tap').test
+var minimatch = require('../')
+
+test('extglob ending with statechar', function(t) {
+  t.notOk(minimatch('ax', 'a?(b*)'))
+  t.ok(minimatch('ax', '?(a*|b)'))
+  t.end()
+})
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/underscore/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/underscore/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/node_modules/underscore/package.json	(revision 516)
@@ -32,8 +32,4 @@
   },
   "_id": "underscore@1.4.4",
-  "_from": "underscore@~1.4.3",
-  "dist": {
-    "shasum": "3e7ceb21f205bc19964685e1fdd52c8f77773674"
-  },
-  "_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
+  "_from": "underscore@1.4.x"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/node_modules/jshint/package.json	(revision 516)
@@ -37,8 +37,8 @@
   "readmeFilename": "README.md",
   "_id": "jshint@1.1.0",
-  "_from": "jshint@1.1.0",
   "dist": {
     "shasum": "1db32329c9bb70ca4e80720113d8a1a90d4d3abb"
   },
+  "_from": "jshint@1.1.0",
   "_resolved": "https://registry.npmjs.org/jshint/-/jshint-1.1.0.tgz"
 }
Index: Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/package.json
===================================================================
--- Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/package.json	(revision 484)
+++ Dev/trunk/node_modules/grunt-htmlhint/node_modules/htmlhint/package.json	(revision 516)
@@ -23,5 +23,8 @@
     "mocha": "~1.8.2",
     "expect.js": "~0.2.0",
-    "jscover": "~0.2.4"
+    "jscover": "~0.2.4",
+    "commander": "^1.1.1",
+    "csslint": "^0.9.10",
+    "jshint": "^1.1.0"
   },
   "bin": {
