Add a Travis CI configuration for master
Merge remote-tracking branch 'origin/cobe-3' into cobe-3

Conflicts:
	.travis.yml