Travis build

Conflicts:
	.travis.yml