Merge pull request #170 from bcoe/update-changelog

update changelog for 6.x release

Author: bcoe

CHANGELOG.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-### Upcoming
+### v6.0.0 (2016/02/20 +7:00)
 
+- [#167](https://github.com/bcoe/nyc/pull/167) all of nyc's settings can now
+  be configured in package.json (@bcoe)
 - [#164](https://github.com/bcoe/nyc/pull/164) coverage tracking now uses absolute paths, awesome \o/ (@novemberborn)
 - [#163](https://github.com/bcoe/nyc/pull/163) support for extensions other than .js (@lloydcotten)
 

package.json

@@ -84,7 +84,7 @@
     "source-map": "^0.5.3",
     "spawn-wrap": "^1.1.1",
     "strip-bom": "^2.0.0",
-    "yargs": "^4.0.0"
+    "yargs": "^4.1.0"
   },
   "devDependencies": {
     "any-path": "^1.3.0",