Cleanup, enable travis