fix Travis oops?

hopefully

Conflicts:
	.travis.yml