make language definitions configurable
make language definitions configurable
Merge branch 'language-path'

Conflicts:
	lib/cli.coffee