Made Travis consistent
Reduced amount of Travis jobs