Remove obsolete option

travis-ci/travis-build#346
Construct matrix through inclusion