corrected typo

Conflicts:
	.travis.yml