diff --git a/.editorconfig b/.editorconfig
index 991900b..818e072 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,3 @@
-# http://editorconfig.org
 root = true
 
 [*]
@@ -9,14 +8,6 @@ indent_size = 2
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.md]
+[{**/{actual,fixtures,expected,templates}/**,*.md}]
 trim_trailing_whitespace = false
-insert_final_newline = false
-
-[test/**]
-trim_trailing_whitespace = false
-insert_final_newline = false
-
-[templates/**]
-trim_trailing_whitespace = false
-insert_final_newline = false
+insert_final_newline = false
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 5c8a697..13bb9ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,20 @@
-*.DS_store
+# always ignore files
+*.DS_Store
 *.sublime-*
-_gh_pages
-bower_components
+
+# test related, or directories generated by tests
+test/actual
+actual
+coverage
+
+# npm
 node_modules
 npm-debug.log
-actual
-test/actual
+
+# misc
+_gh_pages
+bower_components
+vendor
 temp
 tmp
 TODO.md
-vendor
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 09768f0..f28113a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,11 @@
 sudo: false
+os:
+  - linux
+  - osx
 language: node_js
 node_js:
-  - "stable"
-  - "5"
-  - "4"
-  - "0.12"
-  - "0.10"
-matrix:
-  fast_finish: true
-  allow_failures:
-    - node_js: "0.10"
+  - node
+  - '6'
+  - '5'
+  - '0.12'
+  - '0.10'
diff --git a/package.json b/package.json
index 1f6062e..285d958 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,11 @@
   "version": "0.4.2",
   "homepage": "https://github.com/jonschlinkert/parse-git-config",
   "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
+  "contributors": [
+    "Jason Denizac <jason@denizac.org> (https://jden.us)",
+    "Jon Schlinkert <jon.schlinkert@sellside.com> (http://twitter.com/jonschlinkert)",
+    "Sam Holmes <sam@samholmes.net> (https://samholmes.net)"
+  ],
   "repository": "jonschlinkert/parse-git-config",
   "bugs": {
     "url": "https://github.com/jonschlinkert/parse-git-config/issues"
@@ -21,13 +26,13 @@
   },
   "dependencies": {
     "extend-shallow": "^2.0.1",
-    "git-config-path": "^0.2.0",
+    "git-config-path": "^1.0.0",
     "ini": "^1.3.4"
   },
   "devDependencies": {
-    "gulp-format-md": "^0.1.7",
-    "mocha": "^2.4.5",
-    "os-homedir": "^1.0.1"
+    "gulp-format-md": "^0.1.11",
+    "homedir-polyfill": "^1.0.0",
+    "mocha": "^3.1.2"
   },
   "keywords": [
     "config",
@@ -46,12 +51,12 @@
     ],
     "related": {
       "list": [
-        "parse-github-url",
-        "parse-gitignore",
+        "git-user-name",
+        "git-username",
         "parse-author",
         "parse-authors",
-        "git-user-name",
-        "git-username"
+        "parse-github-url",
+        "parse-gitignore"
       ]
     },
     "reflinks": [
@@ -61,4 +66,4 @@
       "reflinks": true
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test.js b/test.js
index b494b50..2ddba7c 100644
--- a/test.js
+++ b/test.js
@@ -10,7 +10,7 @@
 require('mocha');
 var assert = require('assert');
 var path = require('path');
-var home = require('os-homedir');
+var homedir = require('homedir-polyfill');
 var parse = require('./');
 
 describe('sync:', function() {
@@ -53,7 +53,7 @@ describe('resolve:', function() {
   });
 
   it('should allow override path', function() {
-    var fp = path.resolve(home(), '.gitconfig');
+    var fp = path.resolve(homedir(), '.gitconfig');
     assert.equal(parse.resolve({path: fp}), fp);
   });
 
@@ -62,7 +62,7 @@ describe('resolve:', function() {
   });
 
   it('should resolve relative path to the global git config when `global` is passed', function() {
-    assert.equal(parse.resolve('global'), path.resolve(home(), '.gitconfig'));
+    assert.equal(parse.resolve('global'), path.resolve(homedir(), '.gitconfig'));
   });
 
   it('should allow override of cwd', function() {