Do not reset options when calling highlight
Added Game Maker Language
Added JSOnion and Spelunky samples to GML corpus
regen samples.json
regen samples with new new master
Merge pull request #1083 from github/pr-899-updated

Add Game Make Language, part deux (replaces #899)
Merge pull request #879 from zilverline/master

Legit.  Merging.

Thanks for the bugfix, @s0meone!
Merge branch 'master' into 891-update

Conflicts:
	lib/linguist/samples.json