update for CI tests

Conflicts:

	.travis.yml