Revert "Reducing Travis matrix to get back to working build"

This reverts commit eda5bc31daa764a0d681e7ae9bae0f5816ac2291.