Add Objective-C++ to languages.yml
Add Objective-C++ samples
Update samples
Add Grammatical Framework
Change GF lexer from haskell to Haskell
Remove Gla and Gle from Gf test samples
Try to fix encoding probs by converting to utf8
Merge remote-tracking branch 'upstream/master'
Update languages.yml

Added support for Eagle PCB files which are becoming common enough now on Github to make this addition.
Add the Mercury language to linguist

lib/linguist/languages.yml:
    Add the declaration for the language.

samples/Mercury:
    Add samples for the classifier as Mercury shares it's filename extension
    with several other languages.
Added new Rscript code
Move file location based on Travis error message
Does adding Rscript as an alias help?
Merge branch 'pr/411' into obj_cpp

Conflicts:
	lib/linguist/samples.json
YAML file recognition for Inform 7, an interactive fiction design language.

The team account https://github.com/i7 has several active Inform 7 projects.
Inform has long lines, so we line wrap.
E language with samples
Add Kit entry in languages.yml
Add sample file for Kit language
Update samples.json