Added travis, move some things around