Removed Travis from this branch

Conflicts:
	.travis.yml