travis branch ignore and more restructuring