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