Include standard build combinations from Travis CI config.

I broke the build, because these were missing.