Fixes #806 (and duplicate #1215).

Fix a greedy regexp to allow multiple @lang() instances per line
Fixes for the failed travis build