Feature/travis consolidation

Let's see if travis test-times decrease when we merge the unit-test runs again.