Bust that cache
Remove pry
A different approach
Removing todo
3.2.2b1
Merge branch 'vmg/tmscopes' into cache-bustin

Conflicts:
	lib/linguist/version.rb
Use TextMate 1 scope for HTML+ERB files

The TextMate 2 scope requires support for injection grammars, which some parsers don't support.
Bumping version
Merge branch 'master' into cache-bustin

Conflicts:
	lib/linguist/version.rb
CI
Merge pull request #1595 from github/text-html-ruby

Use TextMate 1 scope for HTML+ERB files
Merge branch 'master' into cache-bustin
Removing beta label
Merge pull request #1588 from github/cache-bustin

Bust that cache