Merge commit '294b5117b42d2622f4fb0a1da219d45d98566b6e' from context-coloring

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

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/context-coloring-test.el
Simple merge