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
Add Forth extension .fr; and a sample.
Add 'text' language and heuristics for .fr.
Add .html.fr and .xml.fr; plus samples for .txt.