Updated Travis configuration.

Building with clang works now, and also we from now on will build
both master for the latest release, and develop for the next
release.