fix misnamed travis directive
Merge branch 'master' into travis-stuff

Conflicts:
	.travis.yml