Merge commit '32b276e96118f9e34f4cf9a5a2ae6cae3e772144' from context-coloring

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

diff --cc packages/context-coloring/Cask
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