ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job#49

Merged

dafyddj merged 2 commits intosaltstack-formulas:masterfrom myii:ci/merge-matrix-and-add-salt-lint-and-rubocop

Oct 9, 2019

+115-61

Commits on Oct 8, 2019