Merge remote-tracking branch 'upstream/master' into merge-1-10

* upstream/master: (63 commits)
  mkdirp dep - latest version
  add object diff test
  style
  Release 1.10.0
  remove anon-wrapper in tail.js now that the entire thing is wrapped
  refactor
  use resolve() instead of join() for --require
  change to always use word-based diffs for now. Closes mochajs#733
  add support to pass through flags such as --debug-brk=1234. Closes
mochajs#852
  remove a comment
  Add globbing to support windows-style globs.
  Adding filterLeaks() condition to not consider indices in global
object as leaks
  fix mocha.css whitespace
  Restricting css rules to the mocha container as necessary. Should
minimize interference with external styles
  add sans-serif for arial fallback
  fix weird "em" whitespace
  Save timer references to avoid Sinon interfering in the browser build.
  prevent hooks from being called if we are bailing
  adding before hook to --bail test
  Support `--prof` for profiling
  ...

Conflicts:
	mocha.css

.gitignore

@@ -8,3 +8,6 @@ _mocha.js
 test.js
 my-reporter.js
 *.sw*
+lib/browser/diff.js
+.idea
+*.iml

.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
 node_js:
-  - 0.4
-  - 0.6
-  - 0.8
+  - 0.8
+  - 0.10