Merge commit '3007b2917d71a7d66eb94876536dfd80b0661d40' from context-coloring

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

diff --cc packages/context-coloring/.gitignore
index a269508e685afa26e080793a204b2787f9f6b9b3,0000000000000000000000000000000000000000..b9fedcaefaa1f563ebe984c367d30f66def65707
mode 100644,000000..100644
--- 1/packages/context-coloring/.gitignore
--- /dev/null
+++ b/packages/context-coloring/.gitignore
@@@ -1,4 -1,0 +1,6 @@@
- /benchmark/logs/
- /test/coverage/
++*-autoloads.el
++*-pkg.el
 +*.elc
 +.cask/
++/benchmark/
++/coverage/

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

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

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

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

diff --cc packages/context-coloring/context-coloring-emacs-lisp.el
index 0000000000000000000000000000000000000000,05caa5aa8e4e44663fe935eaa47181b93ecd102f..05caa5aa8e4e44663fe935eaa47181b93ecd102f
mode 000000,100644..100644
--- /dev/null
--- 2/context-coloring-emacs-lisp.el
+++ b/packages/context-coloring/context-coloring-emacs-lisp.el

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

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

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

diff --cc packages/context-coloring/fixtures/.nosearch
Simple merge

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

diff --cc packages/context-coloring/fixtures/benchmark/async-0.9.0.js
Simple merge

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

diff --cc packages/context-coloring/fixtures/benchmark/jquery-2.1.1.js
Simple merge

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

diff --cc packages/context-coloring/fixtures/benchmark/lodash-2.4.1.js
Simple merge

diff --cc packages/context-coloring/fixtures/benchmark/mkdirp-0.5.0.js
Simple merge

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

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

diff --cc packages/context-coloring/fixtures/test/block-scopes.js
Simple merge

diff --cc packages/context-coloring/fixtures/test/catch.js
Simple merge

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

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

diff --cc packages/context-coloring/fixtures/test/comments-and-strings.js
Simple merge

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

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

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

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

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

diff --cc packages/context-coloring/fixtures/test/empty
Simple merge

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

diff --cc packages/context-coloring/fixtures/test/function-scopes.js
Simple merge

diff --cc packages/context-coloring/fixtures/test/global.js
Simple merge

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

diff --cc packages/context-coloring/fixtures/test/initial-level.js
Simple merge

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

diff --cc packages/context-coloring/fixtures/test/key-names.js
Simple merge

diff --cc packages/context-coloring/fixtures/test/key-values.js
Simple merge

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

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

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

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

diff --cc packages/context-coloring/fixtures/test/property-lookup.js
Simple merge

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

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

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

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

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

diff --cc packages/context-coloring/fixtures/test/unterminated-comment.js
Simple merge

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