Makefile & travis & tests cleanup