Handle matrix definitions with lists in them.
Merge pull request #362 from travis-ci/mm-handle-matrix-as-array

Handle matrix definitions with lists in them.