Merge f12bd0a into f6cd5a1

speakeasyjs · Jan 24, 2016 · 953e595 · 953e595
2 parents f6cd5a1 + f12bd0a
commit 953e595
Show file tree

Hide file tree

Showing 21 changed files with 2,168 additions and 942 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,6 @@
-node_modules/*
+# npm
+node_modules
+npm-debug.log
+
+# Mac OS X
+.DS_Store
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1 @@
+test
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "5.3"
+  - "5.0"
+  - "4.1"
+  - "4.0"
   - "0.12"
-  - "iojs"
+after_script: 'istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage'
diff --git a/History.md b/History.md
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2013 Mark Bao
+Copyright (c) 2012-2016 Mark Bao <mark@markbao.com>
+Copyright (c) 2015 Michael Phan-Ba <michael@mikepb.com>
+Copyright (c) 2011 Guy Halford-Thompson <guy@cach.me>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
diff --git a/docs/docco.css b/docs/docco.css