update travis again
Merge branch 'fixtravis'

Conflicts:
	.travis.yml