.travis.yml: Rework Travis matrix

At the moment the .travis.yml implicitly constructs a build matrix
with the two compiler options.  In future we want to add more build
options for wider testing: different base distro, more compiler
versions, etc.  However, a fair few of the possible combinations have
various problems meaning we don't want to test them routinely.

So, this reworks from implicitly constructing the matrix to using
matrix: include: options to explicitly build the options we want.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

.travis.yml

@@ -1,12 +1,11 @@
 language: c
 sudo: false
 
-compiler:
-  - gcc
-  - clang
-
-env:
-    - CFLAGS="-std=gnu99"
+matrix:
+  include:
+  - compiler: gcc
+    env: CFLAGS="-std=gnu99"
+  - compiler: clang
 
 script:
     - make -j2 -k quiet=1