More versatile travis script

Conflicts:
	.travis.yml