Is this still needed?
Merge pull request #1542 from github/travis-updates

Cleaning up travis.yml
Merge branch 'master' into drop-samples.json

Conflicts:
	.travis.yml