Travis CI support - branches

Conflicts:

	.travis.yml