Merge commit '283a006be8e96c7e011dedddb460b289d335a9fb' from context-coloring

diff --cc packages/context-coloring/.gitignore
index f0903181e21b870958459e2f203d632e41fc4e0f,0000000000000000000000000000000000000000..a269508e685afa26e080793a204b2787f9f6b9b3
mode 100644,000000..100644
--- 1/packages/context-coloring/.gitignore
--- /dev/null
+++ b/packages/context-coloring/.gitignore
@@@ -1,3 -1,0 +1,4 @@@
- /libraries/
 +*.elc
++.cask/
 +/benchmark/logs/
++/test/coverage/

diff --cc packages/context-coloring/.travis.yml
Simple merge

diff --cc packages/context-coloring/Cask
index 0000000000000000000000000000000000000000,db61c1c97a99e98618cadc2c336928bd8fa7f0b4..db61c1c97a99e98618cadc2c336928bd8fa7f0b4
mode 000000,100644..100644
--- /dev/null
--- 2/Cask
+++ b/packages/context-coloring/Cask

diff --cc packages/context-coloring/Makefile
Simple merge

diff --cc packages/context-coloring/README.md
Simple merge

diff --cc packages/context-coloring/benchmark/context-coloring-benchmark.el
Simple merge

diff --cc packages/context-coloring/context-coloring.el
Simple merge

diff --cc packages/context-coloring/test/binaries/noop
index 0000000000000000000000000000000000000000,a35b5513dd595bf00cf4c58b87adffac355eabb3..a35b5513dd595bf00cf4c58b87adffac355eabb3
mode 000000,100644..100644
--- /dev/null
--- 2/test/binaries/noop
+++ b/packages/context-coloring/test/binaries/noop

diff --cc packages/context-coloring/test/context-coloring-coverage.el
index 0000000000000000000000000000000000000000,2fe8fa9053529c99de87cd558e788acbeefd3e5b..2fe8fa9053529c99de87cd558e788acbeefd3e5b
mode 000000,100644..100644
--- /dev/null
--- 2/test/context-coloring-coverage.el
+++ b/packages/context-coloring/test/context-coloring-coverage.el

diff --cc packages/context-coloring/test/context-coloring-test.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/empty
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/empty
+++ b/packages/context-coloring/test/fixtures/empty

diff --cc packages/context-coloring/test/fixtures/unterminated-comment.js
index 0000000000000000000000000000000000000000,94d4703cb2b59ee23653686bbb972e3c4042c367..94d4703cb2b59ee23653686bbb972e3c4042c367
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/unterminated-comment.js
+++ b/packages/context-coloring/test/fixtures/unterminated-comment.js