From b983cb923be0485497c561167293262efd170b58 Mon Sep 17 00:00:00 2001
From: jonschlinkert <jon.schlinkert@sellside.com>
Date: Sat, 31 Dec 2016 04:05:10 -0500
Subject: [PATCH] run update

---
 .editorconfig | 13 ++-----------
 .gitignore    | 25 ++++++++++++++++++++-----
 .travis.yml   | 11 +++++++----
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 408d870..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
-
-[**/{actual,fixtures,expected}/**]
-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 b120372..0a16ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,27 @@
+# always ignore files
 *.DS_Store
 *.sublime-*
-_gh_pages
-bower_components
+
+# test related, or directories generated by tests
+test/actual
+actual
+coverage
+.nyc*
+
+# npm
 node_modules
 npm-debug.log
-actual
-test/actual
+
+# yarn
+yarn.lock
+yarn-error.log
+
+# misc
+_gh_pages
+_draft
+_drafts
+bower_components
+vendor
 temp
 tmp
 TODO.md
-vendor
diff --git a/.travis.yml b/.travis.yml
index 3a00948..2b92202 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,16 @@
 sudo: false
+os:
+  - linux
+  - osx
 language: node_js
 node_js:
-  - stable
-  - '5'
+  - node
+  - '6'
   - '4'
   - '0.12'
   - '0.10'
 matrix:
-  fast_finish: true
   allow_failures:
-    - node_js: '0.10'
+    - node_js: '4'
     - node_js: '0.12'
+    - node_js: '0.10'