Bumping to v4.2.0
Updating Oz tmbundle
Merge branch 'master' into cut-release-v4.2.0

Conflicts:
	grammars.yml
Merge pull request #1803 from github/cut-release-v4.2.0

Bumping to v4.2.0
Fix error when matching languages against heuristics: if no language, no heuristic rule should be used
Unit test for fix #1809 on heuristics
Fix for fixture tests: fixture files were not tested at all
Use namespace.js for the heuristic test with no match
Remove .module extension for PHP
Merge pull request #1809 from pchaigno/fix-matches-heuristics

Fix error when matching languages against heuristics
Bumping linguist version
Merge pull request #1812 from github/cut-release-v4.2.1

Bumping linguist version
Fix detection for invalid shebang
SCSS isnt SASS
Merge pull request #1818 from github/remove-scss-from-sass

SCSS isnt SASS
Merge pull request #1813 from github/invalid-shebang

Fix detection for invalid shebang