Merge branch 'beta'

sondr3 · May 29, 2016 · 6e851d0 · 6e851d0
2 parents cdb300b + 0ecea5f
commit 6e851d0
Show file tree

Hide file tree

Showing 101 changed files with 3,033 additions and 2,768 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,12 @@
 # .gitignore for jekyllized projects
 # Folders that shouldn't be tracked
 node_modules/
-temp/
 coverage/
 .envrc
 .coveralls.yml
-test/test-*/
+test/tmp/
+npm-shrinkwrap.json
+.nyc_output
 
 # Ignore hidden folders
 # This takes care of .tmp, .sass-cache, and many others

diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,16 @@
 language: node_js
+sudo: false
 node_js:
-- '0.10'
-after_script:
-- CODECLIMATE_REPO_TOKEN=7b0cbee1382c968a036868d26ec04d0ddc7b7aeef25ceead5ff9ff50a3c2ae8b codeclimate < coverage/lcov.info
-- rm -rf ./coverage
+  - "6"
+  - "5"
+  - "4"
+after_success:
+    - './node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls'
 notifications:
-  email:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/82537018be323f7b8a08
     on_success: change
-    on_failure: change
+    on_failure: always
+    on_start: never
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,2 +1,3 @@
 # Contributing and Issue guidelines
 
+Just don't be a dick.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Sondre Nilsen
+Copyright (c) 2014-2016 Sondre Nilsen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal