Restructure travis builds