Merge pull request #1342 from boneskull/master

updating some deps
Revert "Replaces util.escapeRegexp by the escape-string-regexp package."

This reverts commit fd6bcc583c8ecae0062a394df2ebf16c01493645.

Conflicts:
	package.json
Replaces escapeRegexp with the escape-string-regexp package.
Merge pull request #1344 from jbnicolai/add-escape-string-regexp

Replaces escapeRegexp with the escape-string-regexp package.
Resolve #1235

Adds the 'glob' dependency stand-in for the browser.
Checks in the regenered mocha.js with the correct requires.
Merge pull request #1346 from kevinconway/fix_1354

Resolve #1345
.gitignore: ignore .patch and .diff files
utils.js: correcting botched indentation in canonicalize()

adding second param to docstring