Add matrix support for travis runs.
Use the new zuul patch for a cleaner makefile.
Merge pull request #335 from rase-/add/travis-matrix

Add matrix support for travis runs.