Support of the .pro file extension for Prolog.
Merge branch 'master' of https://github.com/github/linguist into pro
Merge branch 'master' into pro
Merge pull request #933 from pchaigno/pro

Support of the .pro file extension for Prolog.
Removing beta label
Merge pull request #1592 from github/vmg/tmscopes

Vmg/tmscopes
Update README.md
Add TextMate scopes for Sass/SCSS files
Add a TextMate scope for YAML
Add a TextMate scope for JSON
Add a TextMate scope for Objective-C++
Add TextMate scopes for HTML variants
Add a TextMate scope for Literate CoffeeScript
Minor bump
Merge pull request #1593 from github/more-tmscopes

Add more TextMate scopes
Bumping version
Merge branch 'master' into cache-bustin

Conflicts:
	lib/linguist/version.rb