put back adam and miguel, remove temp branch from travis