Feature/refactor travis