Integration with travis-ci

Conflicts:
	.travis.yml